Search code, repositories, users, issues, pull requests...

Copy link

Contributor

@orinokai orinokai commented Jul 16, 2024 •

edited

Loading

Description

Middleware matching is performed at the edge and also in the edge function because there are some patterns we are unable to evaluate at the edge.

When i18n is enabled, the regex generated by Next matches paths with or without a locale in the first segment of the URL path. However, it does not match the specific list of locales and simply matches any string in the first segment.

This is a problem because /test will also match any page at the next level, e.g. /products/test because the matcher assumes products is a locale.

This PR splits URL normalizing and localizing into separate functions, for clarity and type-safety (buildNextRequest now returns a partial NextRequest object), and returns a localizedURL parameter to the middleware matcher so that the above case is avoided by always evaluating the match using the prefixed locale or the default, e.g. /en/products/test.

Tests

Tests have been updated to catch this case

Relevant links (GitHub issues, etc.) or a picture of cute animal

Fixes FRP-761


 fix: ensure 2nd level middleware match respects locales

6bd9781

@github-actions

Copy link

Contributor

github-actions bot commented Jul 16, 2024 •

edited

Loading

📊 Package size report `-0.02%↓`

File	Before (Size / Gzip)	After (Size / Gzip)
`dist/build/functions/edge.js`	`19.0 kB` / `4.9 kB`	^-0.18%↓`19.0 kB` / ^-0.02%↓`4.9 kB`
`edge-runtime/lib/next-request.ts`	`2.6 kB` / `986 B`	^0.2%↑`2.6 kB` / ^-6.39%↓`923 B`
`edge-runtime/lib/response.ts`	`9.4 kB` / `3.0 kB`	^-16.3%↓`7.8 kB` / ^-11%↓`2.6 kB`
`edge-runtime/lib/util.ts`	`3.3 kB` / `1.2 kB`	^12%↑`3.7 kB` / ^8%↑`1.3 kB`
`edge-runtime/middleware.ts`	`2.4 kB` / `996 B`	^13%↑`2.7 kB` / ^13%↑`1.1 kB`
Total _{(Includes all files)}	`5.2 MB` / `950.0 kB`	^-0.02%↓`5.2 MB` / ^-0.02%↓`949.9 kB`
Tarball size	`902.2 kB`	^-0.01%↓`902.1 kB`

Unchanged files

File	Size (Size / Gzip)
`dist/build/advanced-api-routes.js`	`3.8 kB` / `1.2 kB`
`dist/build/cache.js`	`1.0 kB` / `414 B`
`dist/build/content/next-shims/telemetry-storage.cjs`	`1.6 kB` / `659 B`
`dist/build/content/prerendered.js`	`8.1 kB` / `2.5 kB`
`dist/build/content/server.js`	`8.7 kB` / `2.8 kB`
`dist/build/content/static.js`	`3.6 kB` / `1.2 kB`
`dist/build/functions/server.js`	`5.0 kB` / `1.6 kB`
`dist/build/image-cdn.js`	`54.0 kB` / `11.1 kB`
`dist/build/plugin-context.js`	`9.3 kB` / `2.7 kB`
`dist/build/templates/handler-monorepo.tmpl.js`	`1.6 kB` / `671 B`
`dist/build/templates/handler.tmpl.js`	`1.5 kB` / `622 B`
`dist/build/verification.js`	`4.5 kB` / `1.5 kB`
`dist/esm-chunks/chunk-5QSXBV7L.js`	`2.4 kB` / `842 B`
`dist/esm-chunks/chunk-EFGWM7RS.js`	`60.4 kB` / `10.8 kB`
`dist/esm-chunks/chunk-FHR56UHE.js`	`186.1 kB` / `32.8 kB`
`dist/esm-chunks/chunk-GNGHTHMQ.js`	`55.6 kB` / `9.7 kB`
`dist/esm-chunks/chunk-OEQOKJGE.js`	`2.3 kB` / `977 B`
`dist/esm-chunks/package-VEICOFV5.js`	`3.6 kB` / `1.4 kB`
`dist/index.js`	`3.3 kB` / `1.1 kB`
`dist/run/config.js`	`1.2 kB` / `595 B`
`dist/run/constants.js`	`516 B` / `308 B`
`dist/run/handlers/cache.cjs`	`16.1 kB` / `4.4 kB`
`dist/run/handlers/request-context.cjs`	`4.6 kB` / `1.5 kB`
`dist/run/handlers/server.js`	`141.2 kB` / `33.1 kB`
`dist/run/handlers/tracer.cjs`	`29.9 kB` / `6.3 kB`
`dist/run/handlers/tracing.js`	`3.0 MB` / `410.7 kB`
`dist/run/headers.js`	`7.4 kB` / `2.3 kB`
`dist/run/next.cjs`	`23.4 kB` / `5.7 kB`
`dist/run/regional-blob-store.cjs`	`18.6 kB` / `5.2 kB`
`dist/run/revalidate.js`	`1.0 kB` / `475 B`
`dist/shared/blobkey.js`	`742 B` / `399 B`
`dist/shared/cache-types.cjs`	`784 B` / `395 B`
`edge-runtime/lib/headers.ts`	`1.9 kB` / `841 B`
`edge-runtime/lib/logging.ts`	`115 B` / `121 B`
`edge-runtime/lib/middleware.ts`	`1.9 kB` / `815 B`
`edge-runtime/lib/routing.ts`	`15.1 kB` / `3.9 kB`
`edge-runtime/lib/util.test.ts`	`1.6 kB` / `356 B`
`edge-runtime/matchers.json`	`3 B` / `23 B`
`edge-runtime/next.config.json`	`3 B` / `23 B`
`edge-runtime/README.md`	`992 B` / `509 B`
`edge-runtime/shim/index.js`	`1.5 kB` / `717 B`
`edge-runtime/vendor.ts`	`807 B` / `330 B`
`edge-runtime/vendor/deno.land/std@0.134.0/fmt/colors.ts`	`11.9 kB` / `2.5 kB`
`edge-runtime/vendor/deno.land/std@0.134.0/testing/_diff.ts`	`9.6 kB` / `3.0 kB`
`edge-runtime/vendor/deno.land/std@0.134.0/testing/asserts.ts`	`24.7 kB` / `5.9 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/_util/asserts.ts`	`854 B` / `461 B`
`edge-runtime/vendor/deno.land/std@0.175.0/_util/os.ts`	`644 B` / `355 B`
`edge-runtime/vendor/deno.land/std@0.175.0/async/abortable.ts`	`4.0 kB` / `1.0 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/async/deadline.ts`	`974 B` / `544 B`
`edge-runtime/vendor/deno.land/std@0.175.0/async/debounce.ts`	`2.2 kB` / `956 B`
`edge-runtime/vendor/deno.land/std@0.175.0/async/deferred.ts`	`1.5 kB` / `798 B`
`edge-runtime/vendor/deno.land/std@0.175.0/async/delay.ts`	`1.8 kB` / `845 B`
`edge-runtime/vendor/deno.land/std@0.175.0/async/mod.ts`	`465 B` / `241 B`
`edge-runtime/vendor/deno.land/std@0.175.0/async/mux_async_iterator.ts`	`2.5 kB` / `1.1 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/async/pool.ts`	`3.2 kB` / `1.4 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/async/retry.ts`	`2.4 kB` / `1.0 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/async/tee.ts`	`2.1 kB` / `924 B`
`edge-runtime/vendor/deno.land/std@0.175.0/bytes/index_of_needle.ts`	`1.4 kB` / `668 B`
`edge-runtime/vendor/deno.land/std@0.175.0/crypto/timing_safe_equal.ts`	`875 B` / `442 B`
`edge-runtime/vendor/deno.land/std@0.175.0/datetime/to_imf.ts`	`1.3 kB` / `681 B`
`edge-runtime/vendor/deno.land/std@0.175.0/encoding/base64.ts`	`2.5 kB` / `1.0 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/encoding/base64url.ts`	`2.0 kB` / `872 B`
`edge-runtime/vendor/deno.land/std@0.175.0/flags/mod.ts`	`22.6 kB` / `5.9 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/fmt/colors.ts`	`12.4 kB` / `2.7 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/fmt/printf.ts`	`27.7 kB` / `7.7 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/http/cookie.ts`	`11.5 kB` / `3.6 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/_core.ts`	`2.3 kB` / `716 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/_events.d.ts`	`27.2 kB` / `5.8 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/_events.mjs`	`28.0 kB` / `7.4 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/_global.d.ts`	`1.7 kB` / `650 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/_next_tick.ts`	`5.0 kB` / `1.4 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/_process/exiting.ts`	`138 B` / `138 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/_process/process.ts`	`3.8 kB` / `1.4 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/_process/stdio.mjs`	`336 B` / `233 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/_process/streams.mjs`	`4.0 kB` / `1.4 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/_stream.d.ts`	`53.2 kB` / `11.9 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/_stream.mjs`	`91.2 kB` / `25.4 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/_util/_util_callbackify.ts`	`4.3 kB` / `1.7 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/_utils.ts`	`5.9 kB` / `2.0 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/assert.ts`	`23.1 kB` / `4.4 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/assertion_error.ts`	`19.6 kB` / `6.1 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/async_hooks.ts`	`7.7 kB` / `2.1 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/buffer.ts`	`262 B` / `204 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/events.ts`	`303 B` / `221 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/_libuv_winerror.ts`	`7.8 kB` / `1.9 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/_listen.ts`	`561 B` / `342 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/_node.ts`	`443 B` / `335 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/_timingSafeEqual.ts`	`479 B` / `268 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/_utils.ts`	`2.4 kB` / `938 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/_winerror.ts`	`354.4 kB` / `64.4 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/ares.ts`	`2.4 kB` / `1.1 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/async_wrap.ts`	`4.0 kB` / `1.8 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/buffer.ts`	`3.5 kB` / `1.3 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/cares_wrap.ts`	`15.2 kB` / `3.9 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/config.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/connection_wrap.ts`	`2.6 kB` / `1.3 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/constants.ts`	`21.5 kB` / `5.1 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/contextify.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/credentials.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/crypto.ts`	`448 B` / `244 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/errors.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/fs_dir.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/fs_event_wrap.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/fs.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/handle_wrap.ts`	`1.8 kB` / `1.0 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/heap_utils.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/http_parser.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/icu.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/inspector.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/js_stream.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/messaging.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/mod.ts`	`3.1 kB` / `955 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/module_wrap.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/native_module.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/natives.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/node_file.ts`	`2.9 kB` / `1.5 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/node_options.ts`	`1.8 kB` / `989 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/options.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/os.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/performance.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/pipe_wrap.ts`	`10.4 kB` / `3.3 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/process_methods.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/report.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/serdes.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/signal_wrap.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/spawn_sync.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/stream_wrap.ts`	`9.3 kB` / `2.8 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/string_decoder.ts`	`504 B` / `261 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/symbols.ts`	`1.4 kB` / `828 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/task_queue.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/tcp_wrap.ts`	`13.1 kB` / `3.7 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/timers.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/tls_wrap.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/trace_events.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/tty_wrap.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/types.ts`	`5.7 kB` / `1.4 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/udp_wrap.ts`	`12.4 kB` / `3.6 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/url.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/util.ts`	`4.0 kB` / `1.8 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/uv.ts`	`20.1 kB` / `3.8 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/v8.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/worker.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal_binding/zlib.ts`	`87 B` / `104 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/buffer.d.ts`	`73.6 kB` / `12.1 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/buffer.mjs`	`66.1 kB` / `10.6 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/crypto/_keys.ts`	`463 B` / `262 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/crypto/constants.ts`	`252 B` / `173 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/error_codes.ts`	`322 B` / `250 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/errors.ts`	`78.9 kB` / `17.4 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/fixed_queue.ts`	`4.4 kB` / `1.2 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/hide_stack_frames.ts`	`550 B` / `377 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/net.ts`	`3.1 kB` / `1.5 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/normalize_encoding.mjs`	`2.1 kB` / `500 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/options.ts`	`1.7 kB` / `959 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/primordials.mjs`	`1.8 kB` / `431 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/process/per_thread.mjs`	`7.8 kB` / `2.3 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/readline/callbacks.mjs`	`3.8 kB` / `1.4 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/readline/utils.mjs`	`14.3 kB` / `3.7 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/streams/destroy.mjs`	`6.9 kB` / `1.8 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/streams/end-of-stream.mjs`	`7.1 kB` / `1.9 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/streams/utils.mjs`	`5.9 kB` / `1.2 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/util.mjs`	`4.0 kB` / `1.4 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/util/comparisons.ts`	`16.6 kB` / `3.8 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/util/debuglog.ts`	`3.2 kB` / `1.4 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/util/inspect.mjs`	`71.5 kB` / `19.8 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/util/types.ts`	`3.7 kB` / `1.3 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/internal/validators.mjs`	`8.0 kB` / `2.1 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/process.ts`	`19.4 kB` / `5.2 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/stream.ts`	`671 B` / `346 B`
`edge-runtime/vendor/deno.land/std@0.175.0/node/string_decoder.ts`	`10.3 kB` / `3.3 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/util.ts`	`7.8 kB` / `2.2 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/node/util/types.ts`	`199 B` / `153 B`
`edge-runtime/vendor/deno.land/std@0.175.0/path/_constants.ts`	`2.0 kB` / `727 B`
`edge-runtime/vendor/deno.land/std@0.175.0/path/_interface.ts`	`728 B` / `369 B`
`edge-runtime/vendor/deno.land/std@0.175.0/path/_util.ts`	`5.0 kB` / `1.6 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/path/common.ts`	`1.2 kB` / `607 B`
`edge-runtime/vendor/deno.land/std@0.175.0/path/glob.ts`	`12.7 kB` / `3.9 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/path/mod.ts`	`1.4 kB` / `690 B`
`edge-runtime/vendor/deno.land/std@0.175.0/path/posix.ts`	`13.9 kB` / `3.7 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/path/separator.ts`	`259 B` / `209 B`
`edge-runtime/vendor/deno.land/std@0.175.0/path/win32.ts`	`28.5 kB` / `6.4 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/streams/write_all.ts`	`2.2 kB` / `598 B`
`edge-runtime/vendor/deno.land/std@0.175.0/testing/_diff.ts`	`11.6 kB` / `3.6 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/testing/_format.ts`	`705 B` / `462 B`
`edge-runtime/vendor/deno.land/std@0.175.0/testing/asserts.ts`	`25.5 kB` / `5.7 kB`
`edge-runtime/vendor/deno.land/std@0.175.0/types.d.ts`	`4.2 kB` / `1.2 kB`
`edge-runtime/vendor/deno.land/x/html_rewriter@v0.1.0-pre.17/index.ts`	`4.5 kB` / `1.7 kB`
`edge-runtime/vendor/deno.land/x/html_rewriter@v0.1.0-pre.17/vendor/asyncify.js`	`2.6 kB` / `931 B`
`edge-runtime/vendor/deno.land/x/html_rewriter@v0.1.0-pre.17/vendor/html_rewriter.d.ts`	`2.7 kB` / `622 B`
`edge-runtime/vendor/deno.land/x/html_rewriter@v0.1.0-pre.17/vendor/html_rewriter.js`	`28.4 kB` / `4.5 kB`
`edge-runtime/vendor/deno.land/x/path_to_regexp@v6.2.1/index.ts`	`15.4 kB` / `4.2 kB`
`edge-runtime/vendor/import_map.json`	`365 B` / `180 B`
`edge-runtime/vendor/raw.githubusercontent.com/worker-tools/resolvable-promise/master/index.ts`	`1.8 kB` / `657 B`
`edge-runtime/vendor/v1-7-0--edge-utils.netlify.app/logger/logger.ts`	`3.2 kB` / `747 B`
`edge-runtime/vendor/v1-7-0--edge-utils.netlify.app/logger/mod.ts`	`29 B` / `49 B`
`manifest.yml`	`31 B` / `51 B`
`package.json`	`3.2 kB` / `1.2 kB`
`README.md`	`2.7 kB` / `1.1 kB`

_{🤖 This report was automatically generated by pkg-size-action}

orinokai added 7 commits

July 18, 2024 11:56


 fix: ensure adding locale is case sensitive

49fe9ad


 test: update expect message

61ff711


 chore: destructure localizedPath


 feat: allow for locale fallbacks when adding locale prefix

b010192


 fix: pass NextConfig in NextRequest (needed even though it's not in t...

74e2502

...he Next types)


 fix: headers need to be Node.js style plain object (even though Next ...

71ed888

...types allow Headers object)


 test: assert that paths don't match with an invalid prefix

935e621

@orinokai orinokai marked this pull request as ready for review

July 23, 2024 15:20

@orinokai orinokai requested a review from a team as a code owner

July 23, 2024 15:20

orinokai added 7 commits

July 23, 2024 16:20


 Merge branch 'main' into rs/frp-761-imiddleware-locale

8d3972c


 test: remove only

878f022


 chore: refactor for clarity

dccecf9


 chore: revert red herring

bfd3f54


 Merge branch 'rs/frp-761-imiddleware-locale' of github.com:netlify/ne...

e1330fd

...tlify-plugin-nextjs into rs/frp-761-imiddleware-locale


 test: fix incorrect locale test

1a5886e


 chore: refactor NetlifyNextRequest type for clarity

8e691dc

orinokai

orinokai commented

src/build/functions/edge.ts Show resolved Hide resolved

orinokai

orinokai commented

tests/integration/edge-handler.test.ts Outdated Show resolved Hide resolved


 test: fix faulty i18n test logic

a7620fd

orinokai

orinokai commented

tests/integration/edge-handler.test.ts Show resolved Hide resolved

orinokai

orinokai commented

tests/integration/edge-handler.test.ts

}

for (const path of ['/hello/invalid', '/about', '/en/about']) {

for (const path of ['/hello/invalid', '/invalid/hello','/about', '/en/about','/es/about']) {

Copy link

Contributor Author

@orinokai orinokai Jul 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/hello should not be matched when prefixed with a non-locale (this is the main part of the fix) and /about should not be matched when prefixed with anything other than the specific nl locale

pieh

pieh reviewed

Jul 24, 2024

edge-runtime/lib/response.ts Outdated Show resolved Hide resolved

pieh

pieh reviewed

Jul 24, 2024

edge-runtime/lib/util.ts Outdated Show resolved Hide resolved


 chore: refactor to remove normalizeLocalizedTarget

da8215f

pieh

pieh reviewed

Jul 25, 2024

edge-runtime/lib/response.ts Show resolved Hide resolved


 test: update failure messages for clarity

fb8d9ea

@orinokai orinokai added test all versions run-e2e-tests labels

Jul 25, 2024

@orinokai orinokai marked this pull request as draft

July 25, 2024 10:10

@orinokai orinokai marked this pull request as ready for review

July 25, 2024 10:10

@orinokai orinokai removed the test all versions label

Jul 25, 2024

orinokai and others added 2 commits

July 25, 2024 11:21

fix: edge-middleware i18n matching #2555


 chore: update e2e test command docs

af173a6

@pieh


 Merge branch 'main' into rs/frp-761-imiddleware-locale

2bd7c8f

@pieh pieh mentioned this pull request

Jul 26, 2024

Merged