Skip to content

Commit

Permalink
make default adapter undefined
Browse files Browse the repository at this point in the history
  • Loading branch information
markdalgleish committed Jan 18, 2024
1 parent d5f5c68 commit 240cdad
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions packages/remix-dev/vite/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -421,12 +421,12 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
// know the final resolved config until the adapter has been resolved.
remixConfig: remixUserConfig,
})
: {};
let adapterOverrides: AdapterOverrides = pick(adapter, adapterOverrideKeys);
let adapterWithoutOverrides: AdapterWithoutOverrides = omit(
adapter,
adapterOverrideKeys
);
: undefined;

let adapterOverrides: AdapterOverrides | undefined =
adapter && pick(adapter, adapterOverrideKeys);
let adapterWithoutOverrides: AdapterWithoutOverrides | undefined =
adapter && omit(adapter, adapterOverrideKeys);

return { adapterOverrides, adapterWithoutOverrides };
};
Expand All @@ -445,7 +445,7 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
let mergedRemixConfig = {
...defaults,
...remixUserConfig,
...adapterOverrides,
...(adapterOverrides ?? {}),
};

let rootDirectory =
Expand Down

0 comments on commit 240cdad

Please sign in to comment.