Skip to content

Commit

Permalink
imports reorder and object shorthand
Browse files Browse the repository at this point in the history
  • Loading branch information
liady committed Jan 27, 2025
1 parent fdc556e commit 4842137
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 24 deletions.
2 changes: 1 addition & 1 deletion packages/cli/src/commands/hydrogen/deploy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ describe('deploy', async () => {
...expectedConfig,
buildCommand: 'hocus pocus',
},
hooks: hooks,
hooks,
logger: deploymentLogger,
});
});
Expand Down
3 changes: 2 additions & 1 deletion packages/cli/src/commands/hydrogen/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import {
outputContent,
outputInfo,
outputWarn,
Logger,
LogLevel,
} from '@shopify/cli-kit/node/output';
import {readAndParseDotEnv} from '@shopify/cli-kit/node/dot-env';
import {AbortError} from '@shopify/cli-kit/node/error';
Expand All @@ -22,7 +24,6 @@ import {
renderTasks,
renderWarning,
} from '@shopify/cli-kit/node/ui';
import {Logger, LogLevel} from '@shopify/cli-kit/node/output';
import {ciPlatform} from '@shopify/cli-kit/node/context/local';
import {
CompletedDeployment,
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/hydrogen/upgrade.ts
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ async function promptUpgradeOptions(

return renderSelectPrompt({
message: `Available Hydrogen versions (current: ${currentVersion})`,
choices: choices,
choices,
defaultValue: choices[0]?.value, // Latest version
});
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/lib/dev-shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export function getUtilityBannerlines(host: string) {

return [
`View GraphiQL API browser: \n${getGraphiQLUrl({
host: host,
host,
})}`,
`View server network requests: \n${host}/subrequest-profiler`,
].map((value, index) => ({
Expand Down
5 changes: 2 additions & 3 deletions packages/hydrogen/src/cart/cart-test-helper.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {CachingStrategy} from '../cache/strategies';
import {CachingStrategy, CacheNone} from '../cache/strategies';
import type {ExecutionArgs} from 'graphql';
import {Storefront} from '../storefront';
import {CacheNone} from '../cache/strategies';
import {CustomerAccount} from '../customer/types';

export const BUYER_ACCESS_TOKEN = 'sha123';
Expand Down Expand Up @@ -72,7 +71,7 @@ export function mockCreateStorefrontClient() {
return {
query: storefrontQuery,
mutate: storefrontMutate,
CacheNone: CacheNone,
CacheNone,
} as Storefront;
}

Expand Down
31 changes: 14 additions & 17 deletions packages/remix-oxygen/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,7 @@ export {
createMemorySessionStorage,
createSessionStorage,
} from './implementations';

export {createRequestHandler, getStorefrontHeaders} from './server';

export {
createSession,
defer,
isCookie,
isSession,
json,
MaxPartSizeExceededError,
redirect,
redirectDocument,
} from '@remix-run/server-runtime';

export type {
ActionFunction,
ActionFunctionArgs,
Expand All @@ -32,6 +19,7 @@ export type {
ErrorResponse,
HandleDataRequestFunction,
HandleDocumentRequestFunction,
HandleErrorFunction,
HeadersArgs,
HeadersFunction,
HtmlLinkDescriptor,
Expand All @@ -42,15 +30,14 @@ export type {
LoaderFunctionArgs,
MemoryUploadHandlerFilterArgs,
MemoryUploadHandlerOptions,
HandleErrorFunction,
ServerRuntimeMetaArgs as MetaArgs,
ServerRuntimeMetaDescriptor as MetaDescriptor,
ServerRuntimeMetaFunction as MetaFunction,
PageLinkDescriptor,
RequestHandler,
SerializeFrom,
ServerBuild,
ServerEntryModule,
ServerRuntimeMetaArgs as MetaArgs,
ServerRuntimeMetaDescriptor as MetaDescriptor,
ServerRuntimeMetaFunction as MetaFunction,
Session,
SessionData,
SessionIdStorageStrategy,
Expand All @@ -62,3 +49,13 @@ export type {
UploadHandler,
UploadHandlerPart,
} from '@remix-run/server-runtime';
export {
createSession,
defer,
isCookie,
isSession,
json,
MaxPartSizeExceededError,
redirect,
redirectDocument,
} from '@remix-run/server-runtime';

0 comments on commit 4842137

Please sign in to comment.