Merge branch 'canary' into feedthejim/fix-import-map

Author: kodiakhq[bot]

test/integration/middleware-dev-errors/test/index.test.js

@@ -249,9 +249,10 @@ describe('Middleware development errors', () => {
     it('logs the error correctly', async () => {
       await fetchViaHTTP(context.appPort, '/')
       expect(context.logs.output).toContain(`Expected '{', got '}'`)
-      expect(context.logs.output.split(`Expected '{', got '}'`).length).toEqual(
-        2
-      )
+      // TODO: investigate occasional duplicate errors causing flakiness
+      // expect(context.logs.output.split(`Expected '{', got '}'`).length).toEqual(
+      //   2
+      // )
     })
 
     it('renders the error correctly and recovers', async () => {