@netlify/plugin-nextjs 4.17.1-runtime.3 → 4.17.1-runtime.6

package/lib/helpers/dev.js

@@ -27,17 +27,11 @@ const onPreDev = async ({ constants, netlifyConfig }) => {
         console.log('Watching for changes in Next.js middleware...');
     }
     // Eventually we might want to do this via esbuild's API, but for now the CLI works fine
-    const childProcess = (0, execa_1.default)(`esbuild`, [
-        `--bundle`,
-        `--outdir=${(0, path_1.resolve)('.netlify')}`,
-        `--format=esm`,
-        '--watch',
-        // Watch for both, because it can have either ts or js
-        (0, path_1.resolve)(base, 'middleware.ts'),
-        (0, path_1.resolve)(base, 'middleware.js'),
-    ]);
-    childProcess.stdout.pipe(process.stdout);
-    childProcess.stderr.pipe(process.stderr);
+    const common = [`--bundle`, `--outdir=${(0, path_1.resolve)('.netlify')}`, `--format=esm`, `--target=esnext`, '--watch'];
+    // TypeScript
+    (0, execa_1.default)(`esbuild`, [...common, (0, path_1.resolve)(base, 'middleware.ts')], { all: true }).all.pipe(process.stdout);
+    // JavaScript
+    (0, execa_1.default)(`esbuild`, [...common, (0, path_1.resolve)(base, 'middleware.js')], { all: true }).all.pipe(process.stdout);
     // Don't return the promise because we don't want to wait for the child process to finish
 };
 exports.onPreDev = onPreDev;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.17.1-runtime.3",
+  "version": "4.17.1-runtime.6",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^27.14.0",
+    "@netlify/build": "^27.15.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.25",

package/src/templates/edge/next-dev.js

@@ -19,6 +19,7 @@ const exists = async (relativePath) => {
     throw error
   }
 }
+let idx = 0
 
 const handler = async (req, context) => {
   // Uncomment when CLI update lands
@@ -34,8 +35,9 @@ const handler = async (req, context) => {
   // because that would also throw if there's an error in the middleware,
   // which we would want to surface not ignore.
   if (await exists('../../middleware.js')) {
-    // These will be user code
-    const nextMiddleware = await import('../../middleware.js')
+    // We need to cache-bust the import because otherwise it will claim it
+    // doesn't exist if the user creates it after the server starts
+    const nextMiddleware = await import(`../../middleware.js#${idx++}`)
     middleware = nextMiddleware.middleware
   } else {
     //  No middleware, so we silently return