[3.46] Fix an issue in shopify theme dev and shopify app dev that was affecting assets/fonts loading on local servers #2107
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…fecting image loading on local servers
|
Thanks for your contribution! Depending on what you are working on, you may want to request a review from a Shopify team:
|
Coverage report
Test suite run success1070 tests passing in 564 suites. Report generated by 🧪jest coverage report action from 6d709d7 |
…on local servers
Differences in type declarationsWe detected differences in the type declarations generated by Typescript for this branch compared to the baseline ('main' branch). Please, review them to ensure they are backward-compatible. Here are some important things to keep in mind:
New type declarationsWe found no new type declarations in this PR Existing type declarationspackages/cli-kit/dist/private/node/api.d.ts@@ -1,5 +1,5 @@
import { Headers } from 'form-data';
-export type API = 'admin' | 'storefront-renderer' | 'partners' | 'business-platform';
+export type API = 'admin' | 'storefront-renderer' | 'partners';
export declare const allAPIs: API[];
interface RequestOptions<T> {
request: Promise<T>;
packages/cli-kit/dist/private/node/session.d.ts@@ -29,11 +29,6 @@ interface StorefrontRendererAPIOAuthOptions {
/** List of scopes to request permissions for. */
scopes: StorefrontRendererScope[];
}
-type BusinessPlatformScope = 'destinations' | string;
-interface BusinessPlatformAPIOAuthOptions {
- /** List of scopes to request permissions for. */
- scopes: BusinessPlatformScope[];
-}
/**
* It represents the authentication requirements and
* is the input necessary to trigger the authentication
@@ -43,13 +38,11 @@ export interface OAuthApplications {
adminApi?: AdminAPIOAuthOptions;
storefrontRendererApi?: StorefrontRendererAPIOAuthOptions;
partnersApi?: PartnersAPIOAuthOptions;
- businessPlatformApi?: BusinessPlatformAPIOAuthOptions;
}
export interface OAuthSession {
admin?: AdminSession;
partners?: string;
storefront?: string;
- businessPlatform?: string;
}
/**
* This method ensures that we have a valid session to authenticate against the given applications using the provided scopes.
packages/cli-kit/dist/public/common/version.d.ts@@ -1 +1 @@
-export declare const CLI_KIT_VERSION = "3.46.0";
\ No newline at end of file
+export declare const CLI_KIT_VERSION = "3.46.2";
\ No newline at end of file
packages/cli-kit/dist/public/node/metadata.d.ts@@ -27,7 +27,7 @@ export type SensitiveSchema<T> = T extends RuntimeMetadataManager<infer _TPublic
export declare function createRuntimeMetadataContainer<TPublic extends AnyJson, TSensitive extends AnyJson = {
[key: string]: never;
}>(): RuntimeMetadataManager<TPublic, TSensitive>;
-type CmdFieldsFromMonorail = PickByPrefix<MonorailEventPublic, 'cmd_all_'> & PickByPrefix<MonorailEventPublic, 'cmd_app_'> & PickByPrefix<MonorailEventPublic, 'cmd_create_app_'>;
+type CmdFieldsFromMonorail = PickByPrefix<MonorailEventPublic, 'cmd_all_'> & PickByPrefix<MonorailEventPublic, 'cmd_app_'>;
declare const coreData: RuntimeMetadataManager<CmdFieldsFromMonorail, {
commandStartOptions: {
startTime: number;
packages/cli-kit/dist/public/node/monorail.d.ts@@ -2,7 +2,7 @@ import { JsonMap } from '../../private/common/json.js';
import { DeepRequired } from '../common/ts/deep-required.js';
export { DeepRequired };
type Optional<T> = T | null;
-export declare const MONORAIL_COMMAND_TOPIC: "app_cli3_command/1.4";
+export declare const MONORAIL_COMMAND_TOPIC: "app_cli3_command/1.3";
export interface Schemas {
[MONORAIL_COMMAND_TOPIC]: {
sensitive: {
@@ -51,7 +51,6 @@ export interface Schemas {
cmd_dev_tunnel_type?: Optional<string>;
cmd_dev_tunnel_custom_hash?: Optional<string>;
cmd_dev_urls_updated?: Optional<boolean>;
- cmd_create_app_template?: Optional<string>;
app_extensions_any?: Optional<boolean>;
app_extensions_breakdown?: Optional<string>;
app_extensions_count?: Optional<number>;
packages/cli-kit/dist/public/node/session.d.ts@@ -46,13 +46,6 @@ export declare function ensureAuthenticatedAdmin(store: string, scopes?: string[
* @returns The access token and store.
*/
export declare function ensureAuthenticatedThemes(store: string, password: string | undefined, scopes?: string[], forceRefresh?: boolean): Promise<AdminSession>;
-/**
- * Ensure that we have a valid session to access the Business Platform API.
- *
- * @param scopes - Optional array of extra scopes to authenticate with.
- * @returns The access token for the Business Platform API.
- */
-export declare function ensureAuthenticatedBusinessPlatform(scopes?: string[]): Promise<string>;
/**
* Logout from Shopify.
*
packages/cli-kit/dist/public/node/ui.d.ts@@ -213,7 +213,7 @@ export interface RenderSelectPromptOptions<T> extends Omit<SelectPromptProps<T>,
* Other
* (f) first
* (s) second
- * (7) third (limit reached)
+ * (7) third
* (8) fourth
* (9) seventh
* (10) tenth
@@ -269,7 +269,7 @@ export interface RenderAutocompleteOptions<T> extends PartialBy<Omit<Autocomplet
* sixteenth
* seventeenth
* eighteenth
- * nineteenth (disabled)
+ * nineteenth
* twentieth
* twenty-first
* twenty-second
packages/cli-kit/dist/private/node/session/exchange.d.ts@@ -10,7 +10,6 @@ export interface ExchangeScopes {
admin: string[];
partners: string[];
storefront: string[];
- businessPlatform: string[];
}
/**
* Given a valid authorization code, request an identity access token.
packages/cli-kit/dist/public/node/context/fqdn.d.ts@@ -9,12 +9,6 @@ export declare const NotProvidedStoreFQDNError: AbortError;
* @returns Fully-qualified domain of the partners service we should interact with.
*/
export declare function partnersFqdn(): Promise<string>;
-/**
- * It returns the BusinessPlatform' API service we should interact with.
- *
- * @returns Fully-qualified domain of the partners service we should interact with.
- */
-export declare function businessPlatformFqdn(): Promise<string>;
/**
* It returns the Identity service we should interact with.
*
packages/cli-kit/dist/private/node/ui/components/SelectInput.d.ts@@ -3,13 +3,17 @@ import { DOMElement } from 'ink';
declare module 'react' {
function forwardRef<T, P>(render: (props: P, ref: React.Ref<T>) => JSX.Element | null): (props: P & React.RefAttributes<T>) => JSX.Element | null;
}
+interface OnChangeOptions<T> {
+ item: Item<T> | undefined;
+ usedShortcut: boolean;
+}
export interface SelectInputProps<T> {
items: Item<T>[];
- onChange?: (item: Item<T> | undefined) => void;
+ onChange: ({ item, usedShortcut }: OnChangeOptions<T>) => void;
enableShortcuts?: boolean;
focus?: boolean;
emptyMessage?: string;
- defaultValue?: T;
+ defaultValue?: Item<T>;
highlightedTerm?: string;
loading?: boolean;
errorMessage?: string;
@@ -17,18 +21,12 @@ export interface SelectInputProps<T> {
morePagesMessage?: string;
infoMessage?: string;
limit?: number;
- submitWithShortcuts?: boolean;
- onSubmit?: (item: Item<T>) => void;
}
export interface Item<T> {
label: string;
value: T;
key?: string;
group?: string;
- helperText?: string;
- disabled?: boolean;
-}
-export interface ItemWithKey<T> extends Item<T> {
- key: string;
}
-export declare const SelectInput: <T>(props: SelectInputProps<T> & React.RefAttributes<DOMElement>) => JSX.Element | null;
\ No newline at end of file
+export declare const SelectInput: <T>(props: SelectInputProps<T> & React.RefAttributes<DOMElement>) => JSX.Element | null;
+export {};
\ No newline at end of file
packages/cli-kit/dist/private/node/ui/components/TextAnimation.d.ts@@ -1,9 +1,9 @@
-import React from 'react';
+import { FunctionComponent } from 'react';
interface TextAnimationProps {
text: string;
}
/**
* applies a rainbow animation to text.
*/
-declare const TextAnimation: React.MemoExoticComponent<({ text }: TextAnimationProps) => JSX.Element>;
+declare const TextAnimation: FunctionComponent<TextAnimationProps>;
export { TextAnimation };
\ No newline at end of file
|
Benchmark reportWe detected a significant variation of startup time in the following commands.
|
amcaplan
approved these changes
Jun 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport #2105 and #2110