Merge pull request #7 from sst/main

Sync upstream for windows support

Author: costinsin

.changeset/popular-kids-beam.md

@@ -0,0 +1,5 @@
+---
+"open-next": patch
+---
+
+[windows] Add Windows compatibility for the `resolve` ESBuild plugin

.changeset/shy-cups-notice.md

@@ -0,0 +1,5 @@
+---
+"open-next": patch
+---
+
+[windows] Add Windows compatibility for the `replacement` ESBuild plugin

.changeset/witty-dots-film.md

@@ -0,0 +1,5 @@
+---
+"open-next": patch
+---
+
+[windows] Specify the `file://` protocol when importing config on Windows

packages/open-next/src/build.ts

@@ -50,11 +50,13 @@ export async function build(
 
   // Load open-next.config.ts
   const tempDir = initTempDir();
-  const configPath = compileOpenNextConfigNode(
+  let configPath = compileOpenNextConfigNode(
     tempDir,
     openNextConfigPath,
     nodeExternals,
   );
+  // On Windows, we need to use file:// protocol to load the config file using import()
+  if (process.platform === "win32") configPath = `file://${configPath}`;
   config = (await import(configPath)).default as OpenNextConfig;
   validateConfig(config);
 
@@ -333,7 +335,8 @@ async function createImageOptimizationBundle(config: OpenNextConfig) {
     plugins.push(
       openNextReplacementPlugin({
         name: "opennext-14.1.1-image-optimization",
-        target: /plugins\/image-optimization\/image-optimization\.js/g,
+        target:
+          /plugins(\/|\\)image-optimization(\/|\\)image-optimization\.js/g,
         replacements: [
           require.resolve(
             "./adapters/plugins/image-optimization/image-optimization.replacement.js",

packages/open-next/src/build/createServerBundle.ts

@@ -207,7 +207,7 @@ async function generateBundle(
   const plugins = [
     openNextReplacementPlugin({
       name: `requestHandlerOverride ${name}`,
-      target: /core\/requestHandler.js/g,
+      target: /core(\/|\\)requestHandler\.js/g,
       deletes: disableNextPrebundledReact ? ["applyNextjsPrebundledReact"] : [],
       replacements: disableRouting
         ? [
@@ -219,7 +219,7 @@ async function generateBundle(
     }),
     openNextReplacementPlugin({
       name: `utilOverride ${name}`,
-      target: /core\/util.js/g,
+      target: /core(\/|\\)util\.js/g,
       deletes: [
         ...(disableNextPrebundledReact ? ["requireHooks"] : []),
         ...(disableRouting ? ["trustHostHeader"] : []),

packages/open-next/src/plugins/resolve.ts

@@ -44,7 +44,7 @@ export function openNextResolvePlugin({
     name: "opennext-resolve",
     setup(build) {
       logger.debug(`OpenNext Resolve plugin for ${fnName}`);
-      build.onLoad({ filter: /core\/resolve.js/g }, async (args) => {
+      build.onLoad({ filter: /core(\/|\\)resolve\.js/g }, async (args) => {
         let contents = readFileSync(args.path, "utf-8");
         //TODO: refactor this. Every override should be at the same place so we can generate this dynamically
         if (overrides?.wrapper) {