@shopify/shop-minis-cli 0.0.93 → 0.0.94
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/commands/dev/index.d.ts +3 -1
- package/build/commands/dev/index.js +29 -4
- package/build/commands/dev/index.js.map +1 -1
- package/build/commands/dev/utils/deeplink.d.ts +12 -1
- package/build/commands/dev/utils/deeplink.js +25 -9
- package/build/commands/dev/utils/deeplink.js.map +1 -1
- package/build/commands/dev/utils/interactive-terminal.d.ts +1 -1
- package/build/commands/dev/utils/interactive-terminal.js +3 -6
- package/build/commands/dev/utils/interactive-terminal.js.map +1 -1
- package/build/commands/dev/utils/metro/metro-config.d.ts +2 -1
- package/build/commands/dev/utils/metro/metro-config.js +6 -1
- package/build/commands/dev/utils/metro/metro-config.js.map +1 -1
- package/build/commands/dev/utils/metro/metro-minis-module-resolver.d.ts +7 -0
- package/build/commands/dev/utils/metro/metro-minis-module-resolver.js +38 -0
- package/build/commands/dev/utils/metro/metro-minis-module-resolver.js.map +1 -0
- package/build/commands/dev/utils/metro/metro-server.d.ts +2 -2
- package/build/commands/dev/utils/metro/metro-server.js +2 -5
- package/build/commands/dev/utils/metro/metro-server.js.map +1 -1
- package/build/commands/upgrade/index.js +6 -0
- package/build/commands/upgrade/index.js.map +1 -1
- package/build/commands/upgrade/utils/clear-metro-cache.d.ts +1 -0
- package/build/commands/upgrade/utils/clear-metro-cache.js +13 -0
- package/build/commands/upgrade/utils/clear-metro-cache.js.map +1 -0
- package/build/utils/development-params.d.ts +2 -1
- package/build/utils/development-params.js +13 -1
- package/build/utils/development-params.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,8 +2,10 @@ import { Command } from 'commander';
|
|
|
2
2
|
import { BuildType } from './utils/types.js';
|
|
3
3
|
export interface DevCommandOptions {
|
|
4
4
|
resetCache?: boolean;
|
|
5
|
-
host
|
|
5
|
+
host: string;
|
|
6
6
|
buildType: BuildType;
|
|
7
7
|
snapshotVersion?: string;
|
|
8
|
+
widgetLocation?: string;
|
|
9
|
+
widgetType?: string;
|
|
8
10
|
}
|
|
9
11
|
export declare function loadCommand(parentProgram: Command): Promise<void>;
|
|
@@ -3,6 +3,7 @@ import chalk from 'chalk';
|
|
|
3
3
|
import internalIp from 'internal-ip';
|
|
4
4
|
import { outputDebug } from '@shopify/cli-kit/node/output';
|
|
5
5
|
import { handler as handleError } from '@shopify/cli-kit/node/error';
|
|
6
|
+
import _ from 'lodash';
|
|
6
7
|
import { getMiniManifest } from '../../utils/minis-manifest.js';
|
|
7
8
|
import { maybeApplyPatches } from '../../utils/patch-package.js';
|
|
8
9
|
import { getInvalidDependencies } from '../doctor/utils/diagnose-dependencies.js';
|
|
@@ -10,6 +11,15 @@ import { getRunBinCommand } from '../../utils/package-manager.js';
|
|
|
10
11
|
import { InteractiveTerminal } from './utils/interactive-terminal.js';
|
|
11
12
|
import { runMetro } from './utils/metro/metro-server.js';
|
|
12
13
|
import { BuildType } from './utils/types.js';
|
|
14
|
+
// we should import these from the sdk to avoid duplication
|
|
15
|
+
const WIDGET_LOCATIONS = [
|
|
16
|
+
'PRODUCT_PAGE',
|
|
17
|
+
'STORE_PAGE',
|
|
18
|
+
'HOME_FEED',
|
|
19
|
+
'PRODUCT_PAGE_CONTEXT_MENU',
|
|
20
|
+
'ORDER_CONFIRMATION_PAGE',
|
|
21
|
+
'ORDER_MANAGEMENT_PAGE',
|
|
22
|
+
];
|
|
13
23
|
export async function loadCommand(parentProgram) {
|
|
14
24
|
const ip = await internalIp.v4();
|
|
15
25
|
const command = new Command()
|
|
@@ -18,21 +28,30 @@ export async function loadCommand(parentProgram) {
|
|
|
18
28
|
.option('--reset-cache', 'reset the dev server cache')
|
|
19
29
|
.option('--host <host>', "packager's host", ip)
|
|
20
30
|
.option('--verbose', 'print debugging messages') // compatible with cli-kit
|
|
31
|
+
.option('--widget-type <widgetType>')
|
|
32
|
+
.option('--widget-location <widgetLocation>')
|
|
33
|
+
.addOption(new Option('--widget-location <widgetLocation>', 'Location inside Shop to render the widget').choices(WIDGET_LOCATIONS))
|
|
21
34
|
.addOption(new Option('--build-type <buildType>', 'build type')
|
|
22
35
|
.choices(Object.values(BuildType))
|
|
23
36
|
.default(BuildType.Release))
|
|
24
37
|
.addOption(new Option('--snapshot-version <version>', 'specify the snapshot version to use. (example: 2.100.0+544)').implies({ buildType: 'snapshot' }))
|
|
25
38
|
.action(async (options) => {
|
|
26
39
|
try {
|
|
27
|
-
const miniName = getMiniManifest().name;
|
|
28
40
|
outputDebug(`Dev command args ${JSON.stringify(options)}`);
|
|
29
|
-
outputDebug(`Running mini "${miniName}" at ${process.cwd()}`);
|
|
30
41
|
validateOptions(options);
|
|
42
|
+
const isWidget = options.widgetType && options.widgetLocation;
|
|
43
|
+
const { handle: miniHandle, name: miniName } = isWidget
|
|
44
|
+
? { handle: options.widgetType, name: options.widgetType }
|
|
45
|
+
: getMiniManifest();
|
|
46
|
+
outputDebug(isWidget
|
|
47
|
+
? `Running mini widget "${options.widgetType}" in location "${options.widgetLocation}"`
|
|
48
|
+
: `Running mini "${miniName}"`);
|
|
31
49
|
await validateDependencies();
|
|
32
50
|
maybeApplyPatches(); // we need to patch react-native pressability system to avoid duplicated react tags
|
|
33
51
|
await runMetro(options);
|
|
34
52
|
console.log('Local development environment for', chalk.green(miniName), 'is running...');
|
|
35
|
-
const interactiveTerminal = new InteractiveTerminal(options)
|
|
53
|
+
const interactiveTerminal = new InteractiveTerminal(options, miniHandle ?? _.kebabCase(miniName) // newly created minis do not have a handle, we fallback to the name instead.
|
|
54
|
+
);
|
|
36
55
|
interactiveTerminal.start();
|
|
37
56
|
}
|
|
38
57
|
catch (err) {
|
|
@@ -42,13 +61,19 @@ export async function loadCommand(parentProgram) {
|
|
|
42
61
|
});
|
|
43
62
|
parentProgram.addCommand(command);
|
|
44
63
|
}
|
|
45
|
-
function validateOptions({ snapshotVersion, buildType }) {
|
|
64
|
+
function validateOptions({ snapshotVersion, buildType, widgetLocation, widgetType, }) {
|
|
46
65
|
if (snapshotVersion && buildType !== 'snapshot') {
|
|
47
66
|
console.warn('\n--snapshot-version was specified but --build-type is not `snapshot`. --snapshot-version will be ignored.');
|
|
48
67
|
}
|
|
49
68
|
else if (buildType === 'snapshot' && !snapshotVersion) {
|
|
50
69
|
console.warn('\n--build-type was set to `snapshot` but --snapshot-version was not specified. Fetching the latest available snapshot');
|
|
51
70
|
}
|
|
71
|
+
if (widgetLocation && !widgetType) {
|
|
72
|
+
throw new Error('--widget-type is required if --widget-location is present');
|
|
73
|
+
}
|
|
74
|
+
if (!widgetLocation && widgetType) {
|
|
75
|
+
throw new Error('--widget-location is required if --widget-type is present');
|
|
76
|
+
}
|
|
52
77
|
}
|
|
53
78
|
async function validateDependencies() {
|
|
54
79
|
const { areDependenciesInvalid } = getInvalidDependencies();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/dev/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,MAAM,EAAC,MAAM,WAAW,CAAA;AACzC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,UAAU,MAAM,aAAa,CAAA;AACpC,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAA;AACxD,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/dev/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,14 @@
|
|
|
1
1
|
import type { DevCommandOptions } from '../index.js';
|
|
2
|
-
export declare function getBundleUrl(
|
|
2
|
+
export declare function getBundleUrl(host: string): string;
|
|
3
|
+
/**
|
|
4
|
+
* Creates deeplinks to remote minis or remote widget
|
|
5
|
+
*
|
|
6
|
+
* Example deeplink for remote mini:
|
|
7
|
+
* arrive://mini/remote/eyJoYW5kbGUiOiJ0ZXN0IiwiYnVuZGxlVXJsIjoiZ29vZ2xlLmNvbSJ9?shop_id=123
|
|
8
|
+
*
|
|
9
|
+
* Example deeplink for remote widget:
|
|
10
|
+
* arrive://mini/widget/eyJoYW5kbGUiOiJ0ZXN0IiwiYnVuZGxlVXJsIjoiZ29vZ2xlLmNvbSJ9?widgetType=product-upsell&widgetLocation=PRODUCT_PAGE
|
|
11
|
+
*
|
|
12
|
+
* In both cases, the base64 encoded payload contains the bundle url and extra information about the remote environment
|
|
13
|
+
*/
|
|
3
14
|
export declare function getDeeplink(miniHandle: string, options: DevCommandOptions, universalLink?: boolean): string;
|
|
@@ -1,27 +1,43 @@
|
|
|
1
1
|
import { outputDebug } from '@shopify/cli-kit/node/output';
|
|
2
|
-
import {
|
|
2
|
+
import { getDevelopmentQueryStringParams } from '../../../utils/development-params.js';
|
|
3
3
|
import { getMiniManifest } from '../../../utils/minis-manifest.js';
|
|
4
4
|
import { getReactNativeVersion } from './react-native-version.js';
|
|
5
|
-
export function getBundleUrl(
|
|
5
|
+
export function getBundleUrl(host) {
|
|
6
6
|
return `http://${host}:8082/index.bundle`;
|
|
7
7
|
}
|
|
8
|
-
function
|
|
9
|
-
const bundleUrl = getBundleUrl(
|
|
8
|
+
function getDeeplinkPayload(miniHandle, host, isWidget) {
|
|
9
|
+
const bundleUrl = getBundleUrl(host);
|
|
10
10
|
const params = {
|
|
11
11
|
handle: miniHandle,
|
|
12
12
|
bundleUrl: encodeURIComponent(bundleUrl),
|
|
13
13
|
rnVersion: getReactNativeVersion(),
|
|
14
|
-
features: getMiniManifest()?.features ?? undefined,
|
|
15
14
|
};
|
|
15
|
+
if (!isWidget) {
|
|
16
|
+
// @ts-expect-error
|
|
17
|
+
params.features = getMiniManifest()?.features ?? undefined;
|
|
18
|
+
}
|
|
16
19
|
const stringifiedParams = JSON.stringify(params);
|
|
17
20
|
return Buffer.from(stringifiedParams).toString('base64');
|
|
18
21
|
}
|
|
22
|
+
/**
|
|
23
|
+
* Creates deeplinks to remote minis or remote widget
|
|
24
|
+
*
|
|
25
|
+
* Example deeplink for remote mini:
|
|
26
|
+
* arrive://mini/remote/eyJoYW5kbGUiOiJ0ZXN0IiwiYnVuZGxlVXJsIjoiZ29vZ2xlLmNvbSJ9?shop_id=123
|
|
27
|
+
*
|
|
28
|
+
* Example deeplink for remote widget:
|
|
29
|
+
* arrive://mini/widget/eyJoYW5kbGUiOiJ0ZXN0IiwiYnVuZGxlVXJsIjoiZ29vZ2xlLmNvbSJ9?widgetType=product-upsell&widgetLocation=PRODUCT_PAGE
|
|
30
|
+
*
|
|
31
|
+
* In both cases, the base64 encoded payload contains the bundle url and extra information about the remote environment
|
|
32
|
+
*/
|
|
19
33
|
export function getDeeplink(miniHandle, options, universalLink = false) {
|
|
20
|
-
const
|
|
21
|
-
const
|
|
34
|
+
const isWidget = Boolean(options.widgetType && options.widgetLocation);
|
|
35
|
+
const deeplinkParams = getDeeplinkPayload(miniHandle, options.host, isWidget);
|
|
36
|
+
const developmentParams = getDevelopmentQueryStringParams(options);
|
|
37
|
+
const deeplinkPath = isWidget ? '/mini/widget/' : '/mini/remote/';
|
|
22
38
|
const deeplink = universalLink
|
|
23
|
-
? `https://shop.app
|
|
24
|
-
: `arrive
|
|
39
|
+
? `https://shop.app${deeplinkPath}${deeplinkParams}${developmentParams}`
|
|
40
|
+
: `arrive:/${deeplinkPath}${deeplinkParams}${developmentParams}`;
|
|
25
41
|
outputDebug(`Deeplink: ${deeplink}`);
|
|
26
42
|
return deeplink;
|
|
27
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deeplink.js","sourceRoot":"","sources":["../../../../src/commands/dev/utils/deeplink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAA;AAGxD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"deeplink.js","sourceRoot":"","sources":["../../../../src/commands/dev/utils/deeplink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAA;AAGxD,OAAO,EAAC,+BAA+B,EAAC,MAAM,sCAAsC,CAAA;AACpF,OAAO,EAAC,eAAe,EAAC,MAAM,kCAAkC,CAAA;AAEhE,OAAO,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAA;AAE/D,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,OAAO,UAAU,IAAI,oBAAoB,CAAA;AAC3C,CAAC;AAED,SAAS,kBAAkB,CACzB,UAAkB,EAClB,IAAY,EACZ,QAAiB;IAEjB,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,CAAA;IAEpC,MAAM,MAAM,GAAG;QACb,MAAM,EAAE,UAAU;QAClB,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC;QACxC,SAAS,EAAE,qBAAqB,EAAE;KACnC,CAAA;IAED,IAAI,CAAC,QAAQ,EAAE;QACb,mBAAmB;QACnB,MAAM,CAAC,QAAQ,GAAG,eAAe,EAAE,EAAE,QAAQ,IAAI,SAAS,CAAA;KAC3D;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAEhD,OAAO,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;AAC1D,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,WAAW,CACzB,UAAkB,EAClB,OAA0B,EAC1B,aAAa,GAAG,KAAK;IAErB,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC,CAAA;IAEtE,MAAM,cAAc,GAAG,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,IAAK,EAAE,QAAQ,CAAC,CAAA;IAE9E,MAAM,iBAAiB,GAAG,+BAA+B,CAAC,OAAO,CAAC,CAAA;IAElE,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAA;IAEjE,MAAM,QAAQ,GAAG,aAAa;QAC5B,CAAC,CAAC,mBAAmB,YAAY,GAAG,cAAc,GAAG,iBAAiB,EAAE;QACxE,CAAC,CAAC,WAAW,YAAY,GAAG,cAAc,GAAG,iBAAiB,EAAE,CAAA;IAElE,WAAW,CAAC,aAAa,QAAQ,EAAE,CAAC,CAAA;IAEpC,OAAO,QAAQ,CAAA;AACjB,CAAC"}
|
|
@@ -4,7 +4,7 @@ export declare class InteractiveTerminal {
|
|
|
4
4
|
miniHandle: string;
|
|
5
5
|
options: DevCommandOptions;
|
|
6
6
|
_loading?: Ora;
|
|
7
|
-
constructor(options: DevCommandOptions);
|
|
7
|
+
constructor(options: DevCommandOptions, miniHandle: string);
|
|
8
8
|
startWaitingForCommand: () => void;
|
|
9
9
|
stopWaitingForCommand: () => void;
|
|
10
10
|
waitForAnyKeyAndPrintInstructions: () => Promise<void>;
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import open from 'open';
|
|
3
3
|
import ora from 'ora';
|
|
4
|
-
import _ from 'lodash';
|
|
5
|
-
import { getMiniManifest } from '../../../utils/minis-manifest.js';
|
|
6
4
|
import { androidHomeExists } from '../../config.js';
|
|
7
5
|
import { maybeLaunchEmulator, promptForAndroidDevices } from './android.js';
|
|
8
6
|
import { getBundleUrl, getDeeplink } from './deeplink.js';
|
|
@@ -20,9 +18,8 @@ export class InteractiveTerminal {
|
|
|
20
18
|
miniHandle;
|
|
21
19
|
options;
|
|
22
20
|
_loading;
|
|
23
|
-
constructor(options) {
|
|
24
|
-
|
|
25
|
-
this.miniHandle = manifest.handle || _.kebabCase(manifest.name);
|
|
21
|
+
constructor(options, miniHandle) {
|
|
22
|
+
this.miniHandle = miniHandle;
|
|
26
23
|
this.options = options;
|
|
27
24
|
}
|
|
28
25
|
startWaitingForCommand = () => {
|
|
@@ -153,7 +150,7 @@ export class InteractiveTerminal {
|
|
|
153
150
|
// TODO: Should we send these as params? or should the dev panel website already know how to fetch them without the need of query params?
|
|
154
151
|
// Advantage would be that people could just type the base url in the browser whenever they want to open the dev panel. That's impossible with the query params being required
|
|
155
152
|
const paramsObj = {
|
|
156
|
-
bundleUrl: getBundleUrl(this.options),
|
|
153
|
+
bundleUrl: getBundleUrl(this.options.host),
|
|
157
154
|
deepLink: getDeeplink(this.miniHandle, this.options, true),
|
|
158
155
|
};
|
|
159
156
|
const searchParams = `?${new URLSearchParams(paramsObj).toString()}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interactive-terminal.js","sourceRoot":"","sources":["../../../../src/commands/dev/utils/interactive-terminal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,GAAU,MAAM,KAAK,CAAA;
|
|
1
|
+
{"version":3,"file":"interactive-terminal.js","sourceRoot":"","sources":["../../../../src/commands/dev/utils/interactive-terminal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,GAAU,MAAM,KAAK,CAAA;AAG5B,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAA;AAEjD,OAAO,EAAC,mBAAmB,EAAE,uBAAuB,EAAC,MAAM,cAAc,CAAA;AACzE,OAAO,EAAC,YAAY,EAAE,WAAW,EAAC,MAAM,eAAe,CAAA;AACvD,OAAO,EAAC,WAAW,EAAC,MAAM,cAAc,CAAA;AACxC,OAAO,EAAC,aAAa,EAAE,kBAAkB,EAAC,MAAM,gBAAgB,CAAA;AAChE,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AACtC,OAAO,EAAC,QAAQ,EAAC,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAC,kBAAkB,EAAC,MAAM,oCAAoC,CAAA;AAErE,MAAM,EAAC,KAAK,EAAC,GAAG,OAAO,CAAA;AAEvB,SAAS,aAAa;IACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;AAC9C,CAAC;AAED,MAAM,MAAM,GAAG,QAAQ,CAAA;AAEvB,MAAM,OAAO,mBAAmB;IAC9B,UAAU,CAAQ;IAClB,OAAO,CAAmB;IAC1B,QAAQ,CAAM;IAEd,YAAY,OAA0B,EAAE,UAAkB;QACxD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAED,sBAAsB,GAAG,GAAG,EAAE;QAC5B,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;YACrB,OAAO,CAAC,IAAI,CACV,sFAAsF,CACvF,CAAA;YACD,OAAM;SACP;QACD,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACtB,KAAK,CAAC,MAAM,EAAE,CAAA;QACd,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QACzB,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAA;IAC9C,CAAC,CAAA;IAED,qBAAqB,GAAG,GAAG,EAAE;QAC3B,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAA;QACxD,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;YACrB,OAAO,CAAC,IAAI,CACV,sFAAsF,CACvF,CAAA;YACD,OAAM;SACP;QACD,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QACvB,KAAK,CAAC,MAAM,EAAE,CAAA;IAChB,CAAC,CAAA;IAED,iCAAiC,GAAG,KAAK,IAAI,EAAE;QAC7C,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;QAC3C,IAAI,CAAC,qBAAqB,EAAE,CAAA;QAC5B,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;YACrB,OAAO,CAAC,IAAI,CACV,sFAAsF,CACvF,CAAA;YACD,OAAM;SACP;QACD,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACtB,KAAK,CAAC,MAAM,EAAE,CAAA;QACd,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CACjC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;YAC9B,IAAI,CAAC,eAAe,EAAE,CAAA;YACtB,OAAO,EAAE,CAAA;QACX,CAAC,CAAC,CACH,CAAA;IACH,CAAC,CAAA;IAED,eAAe;QACb,OAAO,CAAC,GAAG,CACT,aAAa,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;UAC7B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,0BAA0B,CACnD,CAAA;QACD,OAAO,CAAC,GAAG,CACT,aAAa,KAAK,CAAC,IAAI,CAAC,IAAI,CAC1B,GAAG,CACJ;UACG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,4CAA4C,CACrE,CAAA;QACD,OAAO,CAAC,GAAG,CACT,aAAa,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;KAClC,CACA,CAAA;QACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAA;IACjD,CAAC;IAED,KAAK;QACH,IAAI,CAAC,eAAe,EAAE,CAAA;QACtB,IAAI,CAAC,sBAAsB,EAAE,CAAA;IAC/B,CAAC;IAED,qBAAqB,GAAG,KAAK,EAAE,GAAW,EAAE,EAAE;QAC5C,IAAI;YACF,IAAI,CAAC,qBAAqB,EAAE,CAAA;YAC5B,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;SAC/B;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,CAAC,0CAA0C,GAAG,EAAE,CAAC,CAAA;YAC5D,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;SACjB;gBAAS;YACR,IAAI,CAAC,sBAAsB,EAAE,CAAA;SAC9B;IACH,CAAC,CAAA;IAED,YAAY,CACV,UAAkB,EAClB,UAGI,EAAE;QAEN,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,UAAU,CACb,OAAO,CAAC,4BAA4B,EACpC,OAAO,CAAC,6BAA6B,CACtC,CAAA;SACF;QAED,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,EAAC,IAAI,EAAE,UAAU,EAAC,CAAC,CAAC,KAAK,EAAE,CAAA;IACjD,CAAC;IAED,UAAU,CACR,WAAiD,SAAS,EAC1D,UAAmB;QAEnB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,OAAM;SACP;QAED,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAA;QACnC,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED,cAAc,GAAG,KAAK,EAAE,GAAW,EAAE,EAAE;QACrC,QAAQ,GAAG,EAAE;YACX,KAAK,GAAG,CAAC,CAAC;gBACR,IAAI,CAAC,eAAe,EAAE,CAAA;gBACtB,MAAK;aACN;YACD,KAAK,GAAG,CAAC,CAAC;gBACR,aAAa,EAAE,CAAA;gBAEf,IAAI,CAAC,iBAAiB,EAAE,EAAE;oBACxB,IAAI,CAAC,gCAAgC,EAAE,CAAA;oBACvC,MAAK;iBACN;gBAED,MAAM,MAAM,GAAG,MAAM,uBAAuB,EAAE,CAAA;gBAC9C,IAAI,MAAM,EAAE;oBACV,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE;wBAC9B,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAA;wBACvC,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;wBACzD,IAAI,CAAC,UAAU,EAAE;4BACf,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,4BAA4B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;4BAClE,MAAK;yBACN;wBACD,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;qBAClD;yBAAM;wBACL,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;qBACnD;iBACF;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAA;oBAC/D,OAAO,CAAC,GAAG,CACT,OAAO,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAC9B,gEAAgE,CACjE,kEAAkE,CACpE,CAAA;oBACD,OAAO,CAAC,GAAG,CACT,MAAM,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAC7B,+DAA+D,CAChE,iDAAiD,CACnD,CAAA;oBACD,IAAI,CAAC,iCAAiC,EAAE,CAAA;iBACzC;gBAED,MAAK;aACN;YACD,KAAK,GAAG,CAAC,CAAC;gBACR,aAAa,EAAE,CAAA;gBACf,MAAM,SAAS,GAAG,MAAM,kBAAkB,EAAE,CAAA;gBAC5C,IAAI,SAAS,EAAE;oBACb,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,CAAA;oBACxC,MAAM,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;oBACnC,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;iBAClD;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;iBAC7C;gBACD,MAAK;aACN;YACD,KAAK,GAAG,CAAC,CAAC;gBACR,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAA;gBAChC,MAAK;aACN;YACD,KAAK,GAAG,CAAC,CAAC;gBACR,yIAAyI;gBACzI,8KAA8K;gBAC9K,MAAM,SAAS,GAAG;oBAChB,SAAS,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;oBAC1C,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC;iBAC3D,CAAA;gBAED,MAAM,YAAY,GAAG,IAAI,IAAI,eAAe,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAA;gBAEpE,IAAI,CAAC,GAAG,kBAAkB,GAAG,YAAY,EAAE,CAAC,CAAA;gBAC5C,MAAK;aACN;YACD,KAAK,MAAM,CAAC,CAAC;gBACX,IAAI,CAAC,qBAAqB,EAAE,CAAA;gBAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;gBACf,aAAa;gBACb,MAAK;aACN;YACD,OAAO,CAAC,CAAC;gBACP,MAAK;aACN;SACF;IACH,CAAC,CAAA;IAED,KAAK,CAAC,gCAAgC;QACpC,OAAO,CAAC,IAAI,CACV,KAAK,CAAC,GAAG,CACP,yJAAyJ,CAC1J,CACF,CAAA;QACD,OAAO,CAAC,GAAG,CACT,OAAO,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAC9B,6DAA6D,CAC9D,EAAE,CACJ,CAAA;QACD,MAAM,IAAI,CAAC,iCAAiC,EAAE,CAAA;IAChD,CAAC;IAED,KAAK,CAAC,mBAAmB;QACvB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACjB,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAA;QACnE,OAAO,CAAC,GAAG,CACT,6FAA6F,CAC9F,CAAA;IACH,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,QAAkB,EAAE,QAAgB;QACzD,IAAI;YACF,MAAM,QAAQ,CACZ;gBACE,QAAQ;gBACR,QAAQ;gBACR,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;gBACjC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe;aAC9C,EACD,IAAI,CAAC,eAAe,CACrB,CAAA;SACF;QAAC,OAAO,GAAQ,EAAE;YACjB,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,IAAI,GAAG,CAAC,CAAA;SAC/D;IACH,CAAC;IAED,IAAY,QAAQ;QAClB,OAAO,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;IACnD,CAAC;IAED,IAAY,eAAe;QACzB,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;YAC5C,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;YACxC,eAAe,EAAE,CAAC,IAAY,EAAE,EAAE;gBAChC,IAAI,IAAI,CAAC,QAAQ,EAAE;oBACjB,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAA;iBAC1B;YACH,CAAC;SACF,CAAA;IACH,CAAC;CACF"}
|
|
@@ -4,13 +4,14 @@ import { loadMetroConfig } from '@react-native-community/cli-plugin-metro';
|
|
|
4
4
|
import cli from '@react-native-community/cli';
|
|
5
5
|
import { createMinisMetroReporter } from './metro-reporter.js';
|
|
6
6
|
import { injectMetroServerMiddleware } from './metro-server-middleware.js';
|
|
7
|
+
import { createMinisModuleResolver } from './metro-minis-module-resolver.js';
|
|
7
8
|
// Import as cjs
|
|
8
9
|
// TODO: this way of requiring libraries loses the types
|
|
9
10
|
// https://github.com/Shopify/shop-minis-cli/issues/191
|
|
10
11
|
const defaults = createRequire(import.meta.url)('metro-config/src/defaults/defaults');
|
|
11
12
|
// modified so that metro uses the mini dependency path and not the CLI dependency when using symlinks to run the CLI (yarn link)
|
|
12
13
|
defaults.moduleSystem = `${process.cwd()}/node_modules/metro-runtime/src/polyfills/require.js`;
|
|
13
|
-
export async function getMetroConfig() {
|
|
14
|
+
export async function getMetroConfig(options) {
|
|
14
15
|
const metroConfig = await loadMetroConfig(cli.loadConfig());
|
|
15
16
|
// @ts-ignore - @types/metro is outdated and missing this attribute: https://facebook.github.io/metro/docs/configuration/#emptymodulepath
|
|
16
17
|
// Fix required when using yarn link to run a local version of the CLI in a mini
|
|
@@ -22,6 +23,10 @@ export async function getMetroConfig() {
|
|
|
22
23
|
const reporter = createMinisMetroReporter();
|
|
23
24
|
return {
|
|
24
25
|
...metroConfig,
|
|
26
|
+
resolver: {
|
|
27
|
+
...metroConfig.resolver,
|
|
28
|
+
resolveRequest: createMinisModuleResolver(metroConfig, options),
|
|
29
|
+
},
|
|
25
30
|
reporter,
|
|
26
31
|
};
|
|
27
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metro-config.js","sourceRoot":"","sources":["../../../../../src/commands/dev/utils/metro/metro-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAA;AACzC,OAAO,IAAI,MAAM,MAAM,CAAA;AAGvB,OAAO,EAAC,eAAe,EAAC,MAAM,0CAA0C,CAAA;AACxE,OAAO,GAAG,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"metro-config.js","sourceRoot":"","sources":["../../../../../src/commands/dev/utils/metro/metro-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAA;AACzC,OAAO,IAAI,MAAM,MAAM,CAAA;AAGvB,OAAO,EAAC,eAAe,EAAC,MAAM,0CAA0C,CAAA;AACxE,OAAO,GAAG,MAAM,6BAA6B,CAAA;AAI7C,OAAO,EAAC,wBAAwB,EAAC,MAAM,qBAAqB,CAAA;AAC5D,OAAO,EAAC,2BAA2B,EAAC,MAAM,8BAA8B,CAAA;AACxE,OAAO,EAAC,yBAAyB,EAAC,MAAM,kCAAkC,CAAA;AAE1E,gBAAgB;AAChB,wDAAwD;AACxD,uDAAuD;AACvD,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAC7C,oCAAoC,CACrC,CAAA;AAED,iIAAiI;AACjI,QAAQ,CAAC,YAAY,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,sDAAsD,CAAA;AAE9F,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAA0B;IAE1B,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAA;IAE3D,yIAAyI;IACzI,gFAAgF;IAChF,WAAW,CAAC,QAAQ,CAAC,eAAe,GAAG,IAAI,CAAC,IAAI,CAC9C,WAAW,CAAC,WAAW,EACvB,cAAc,EACd,2CAA2C,CAC5C,CAAA;IAED,aAAa;IACb,gFAAgF;IAChF,WAAW,CAAC,WAAW,CAAC,sBAAsB,GAAG,IAAI,CAAC,IAAI,CACxD,WAAW,CAAC,WAAW,EACvB,cAAc,EACd,wCAAwC,CACzC,CAAA;IAED,2BAA2B,CAAC,WAAW,CAAC,CAAA;IAExC,MAAM,QAAQ,GAAG,wBAAwB,EAAE,CAAA;IAE3C,OAAO;QACL,GAAG,WAAW;QACd,QAAQ,EAAE;YACR,GAAG,WAAW,CAAC,QAAQ;YACvB,cAAc,EAAE,yBAAyB,CAAC,WAAW,EAAE,OAAO,CAAC;SAChE;QACD,QAAQ;KACT,CAAA;AACH,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { ConfigT, ResolverConfigT } from 'metro-config';
|
|
2
|
+
import { DevCommandOptions } from '../../index.js';
|
|
3
|
+
/**
|
|
4
|
+
* Returns a custom `resolveRequest` function for metro that resolves `minis:widget` imports to
|
|
5
|
+
* the component and `minis:seed` to the seeds of the widget specified in the `--widget-type` option.
|
|
6
|
+
*/
|
|
7
|
+
export declare function createMinisModuleResolver(existingMetroConfig: ConfigT, options: DevCommandOptions): ResolverConfigT['resolveRequest'];
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
/**
|
|
3
|
+
* Returns a custom `resolveRequest` function for metro that resolves `minis:widget` imports to
|
|
4
|
+
* the component and `minis:seed` to the seeds of the widget specified in the `--widget-type` option.
|
|
5
|
+
*/
|
|
6
|
+
export function createMinisModuleResolver(existingMetroConfig, options) {
|
|
7
|
+
return (context, moduleName, platform) => {
|
|
8
|
+
if (moduleName === 'minis:widget') {
|
|
9
|
+
return resolveWidgetComponent(options);
|
|
10
|
+
}
|
|
11
|
+
if (moduleName === 'minis:seed') {
|
|
12
|
+
return resolveWidgetSeed(options);
|
|
13
|
+
}
|
|
14
|
+
const resolver = existingMetroConfig?.resolver?.resolveRequest ?? context.resolveRequest;
|
|
15
|
+
return resolver(context, moduleName, platform);
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
function resolveWidgetComponent(options) {
|
|
19
|
+
if (!options.widgetType) {
|
|
20
|
+
throw new Error(`minis:widget import found but no widget specified. Please specify a widget with the --widget-type option.`);
|
|
21
|
+
}
|
|
22
|
+
const widgetImportPath = path.join(process.cwd(), 'widgets', options.widgetType, 'index.tsx');
|
|
23
|
+
return {
|
|
24
|
+
type: 'sourceFile',
|
|
25
|
+
filePath: widgetImportPath,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
function resolveWidgetSeed(options) {
|
|
29
|
+
if (!options.widgetType) {
|
|
30
|
+
throw new Error(`minis:seed import found but no widget specified. Please specify an widget with the --widget-type option.`);
|
|
31
|
+
}
|
|
32
|
+
const seedImportPath = path.join(process.cwd(), 'widgets', options.widgetType, 'seed.ts');
|
|
33
|
+
return {
|
|
34
|
+
type: 'sourceFile',
|
|
35
|
+
filePath: seedImportPath,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=metro-minis-module-resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metro-minis-module-resolver.js","sourceRoot":"","sources":["../../../../../src/commands/dev/utils/metro/metro-minis-module-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAM5B;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CACvC,mBAA4B,EAC5B,OAA0B;IAE1B,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;QACvC,IAAI,UAAU,KAAK,cAAc,EAAE;YACjC,OAAO,sBAAsB,CAAC,OAAO,CAAC,CAAA;SACvC;QACD,IAAI,UAAU,KAAK,YAAY,EAAE;YAC/B,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAA;SAClC;QAED,MAAM,QAAQ,GACZ,mBAAmB,EAAE,QAAQ,EAAE,cAAc,IAAI,OAAO,CAAC,cAAc,CAAA;QAEzE,OAAO,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC,CAAA;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,OAA0B;IACxD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,MAAM,IAAI,KAAK,CACb,2GAA2G,CAC5G,CAAA;KACF;IAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAChC,OAAO,CAAC,GAAG,EAAE,EACb,SAAS,EACT,OAAO,CAAC,UAAU,EAClB,WAAW,CACZ,CAAA;IAED,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,gBAAgB;KAClB,CAAA;AACZ,CAAC;AAED,SAAS,iBAAiB,CAAC,OAA0B;IACnD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,MAAM,IAAI,KAAK,CACb,0GAA0G,CAC3G,CAAA;KACF;IAED,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAC9B,OAAO,CAAC,GAAG,EAAE,EACb,SAAS,EACT,OAAO,CAAC,UAAU,EAClB,SAAS,CACV,CAAA;IAED,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,cAAc;KAChB,CAAA;AACZ,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import
|
|
2
|
-
export declare function runMetro(options
|
|
1
|
+
import { DevCommandOptions } from '../../index.js';
|
|
2
|
+
export declare function runMetro(options: DevCommandOptions): Promise<void>;
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
import Metro from 'metro';
|
|
2
2
|
import { getMetroConfig } from './metro-config.js';
|
|
3
|
-
|
|
4
|
-
resetCache: false,
|
|
5
|
-
};
|
|
6
|
-
export async function runMetro(options = DEFAULT_OPTIONS) {
|
|
3
|
+
export async function runMetro(options) {
|
|
7
4
|
const { host, ...metroOptions } = options;
|
|
8
5
|
const metroServerConfig = {
|
|
9
|
-
...(await getMetroConfig()),
|
|
6
|
+
...(await getMetroConfig(options)),
|
|
10
7
|
...metroOptions,
|
|
11
8
|
};
|
|
12
9
|
await Metro.runServer(metroServerConfig, { host });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metro-server.js","sourceRoot":"","sources":["../../../../../src/commands/dev/utils/metro/metro-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAA;AAEhD,MAAM,
|
|
1
|
+
{"version":3,"file":"metro-server.js","sourceRoot":"","sources":["../../../../../src/commands/dev/utils/metro/metro-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAA;AAEhD,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,OAA0B;IACvD,MAAM,EAAC,IAAI,EAAE,GAAG,YAAY,EAAC,GAAG,OAAO,CAAA;IACvC,MAAM,iBAAiB,GAAY;QACjC,GAAG,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;QAClC,GAAG,YAAY;KAChB,CAAA;IAED,MAAM,KAAK,CAAC,SAAS,CAAC,iBAAiB,EAAE,EAAC,IAAI,EAAC,CAAC,CAAA;IAEhD,IAAI,IAAI,KAAK,WAAW,EAAE;QACxB,MAAM,KAAK,CAAC,SAAS,CAAC,iBAAiB,EAAE,EAAC,IAAI,EAAE,WAAW,EAAC,CAAC,CAAA;KAC9D;AACH,CAAC"}
|
|
@@ -5,7 +5,9 @@ import { getMiniManifest } from '../../utils/minis-manifest.js';
|
|
|
5
5
|
import { CLI_VERSION as CURRENT_CLI_VERSION } from '../config.js';
|
|
6
6
|
import { getRunBinCommand, execUpgradePackageCommand, getPackageVersion, } from '../../utils/package-manager.js';
|
|
7
7
|
import { execAsync } from '../../utils/exec-async-child-process.js';
|
|
8
|
+
import { wrapWithLoadingIndicator } from '../../utils/wrap-with-loading-indicator.js';
|
|
8
9
|
import { validateTargetCLIVersion } from './utils/cli.js';
|
|
10
|
+
import { clearMetroCache } from './utils/clear-metro-cache.js';
|
|
9
11
|
export const command = new Command()
|
|
10
12
|
.name('upgrade')
|
|
11
13
|
.description('Upgrade your Shop Mini configuration')
|
|
@@ -46,6 +48,10 @@ export const command = new Command()
|
|
|
46
48
|
].filter(Boolean));
|
|
47
49
|
execSync(codemodCommand, { stdio: 'inherit' });
|
|
48
50
|
}
|
|
51
|
+
await wrapWithLoadingIndicator(clearMetroCache(), {
|
|
52
|
+
loadingMessage: 'Clearing metro cache',
|
|
53
|
+
successMessage: 'Metro cache cleared',
|
|
54
|
+
});
|
|
49
55
|
});
|
|
50
56
|
export async function loadCommand(parentProgram) {
|
|
51
57
|
parentProgram.addCommand(command);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/upgrade/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AAEtC,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAA;AAExD,OAAO,EAAC,eAAe,EAAC,MAAM,+BAA+B,CAAA;AAC7D,OAAO,EAAC,WAAW,IAAI,mBAAmB,EAAC,MAAM,cAAc,CAAA;AAC/D,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAC,SAAS,EAAC,MAAM,yCAAyC,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/upgrade/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function clearMetroCache(): Promise<void>;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { loadMetroConfig } from '@react-native-community/cli-plugin-metro';
|
|
2
|
+
import cli from '@react-native-community/cli';
|
|
3
|
+
export async function clearMetroCache() {
|
|
4
|
+
try {
|
|
5
|
+
const metroConfig = await loadMetroConfig(cli.loadConfig());
|
|
6
|
+
const cacheClears = metroConfig.cacheStores.map(store => store.clear());
|
|
7
|
+
await Promise.all(cacheClears);
|
|
8
|
+
}
|
|
9
|
+
catch {
|
|
10
|
+
// do nothing if invalidating the metro cache fails
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=clear-metro-cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clear-metro-cache.js","sourceRoot":"","sources":["../../../../src/commands/upgrade/utils/clear-metro-cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,0CAA0C,CAAA;AACxE,OAAO,GAAG,MAAM,6BAA6B,CAAA;AAE7C,MAAM,CAAC,KAAK,UAAU,eAAe;IACnC,IAAI;QACF,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAA;QAC3D,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAA;QACvE,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;KAC/B;IAAC,MAAM;QACN,mDAAmD;KACpD;AACH,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { DevCommandOptions } from '../commands/dev/index.js';
|
|
1
2
|
declare const ALLOWED_ENTRY_POINT_PARAMS: readonly ["product_id", "shop_id", "product_variant_id", "external_id", "shop_domain", "order_id", "category_id"];
|
|
2
3
|
type DevelopmentEntryPointParams = {
|
|
3
4
|
[key in (typeof ALLOWED_ENTRY_POINT_PARAMS)[number]]?: string;
|
|
@@ -9,5 +10,5 @@ type DevelopmentEntryPointParams = {
|
|
|
9
10
|
* Returns empty string if the file does not exist or if the format of its content is incorrect.
|
|
10
11
|
*/
|
|
11
12
|
export declare function getDevelopmentEntryPointParams(): DevelopmentEntryPointParams;
|
|
12
|
-
export declare function
|
|
13
|
+
export declare function getDevelopmentQueryStringParams(options: DevCommandOptions): string;
|
|
13
14
|
export {};
|
|
@@ -35,9 +35,21 @@ export function getDevelopmentEntryPointParams() {
|
|
|
35
35
|
return {};
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
|
-
|
|
38
|
+
function getDevelopmentEntryPointParamsQueryString() {
|
|
39
39
|
const paramsObject = getDevelopmentEntryPointParams();
|
|
40
40
|
const paramsQueryString = new URLSearchParams(paramsObject).toString();
|
|
41
41
|
return paramsQueryString ? `?${paramsQueryString}` : '';
|
|
42
42
|
}
|
|
43
|
+
function getDevelopmentWidgetParamsQueryString(options) {
|
|
44
|
+
return `?${new URLSearchParams({
|
|
45
|
+
widgetType: options.widgetType,
|
|
46
|
+
widgetLocation: options.widgetLocation,
|
|
47
|
+
}).toString()}`;
|
|
48
|
+
}
|
|
49
|
+
export function getDevelopmentQueryStringParams(options) {
|
|
50
|
+
const isWidget = Boolean(options.widgetType && options.widgetLocation);
|
|
51
|
+
return isWidget
|
|
52
|
+
? getDevelopmentWidgetParamsQueryString(options)
|
|
53
|
+
: getDevelopmentEntryPointParamsQueryString();
|
|
54
|
+
}
|
|
43
55
|
//# sourceMappingURL=development-params.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"development-params.js","sourceRoot":"","sources":["../../src/utils/development-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAA;AACzC,OAAO,IAAI,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"development-params.js","sourceRoot":"","sources":["../../src/utils/development-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAA;AACzC,OAAO,IAAI,MAAM,WAAW,CAAA;AAI5B,MAAM,0BAA0B,GAAG;IACjC,YAAY;IACZ,SAAS;IACT,oBAAoB;IACpB,aAAa;IACb,aAAa;IACb,UAAU;IACV,aAAa;CACL,CAAA;AAMV,MAAM,4BAA4B,GAAG,yBAAyB,CAAA;AAC9D,MAAM,4BAA4B,GAAG,IAAI,CAAC,IAAI,CAC5C,OAAO,CAAC,GAAG,EAAE,EACb,4BAA4B,CAC7B,CAAA;AAED;;;;;GAKG;AACH,MAAM,UAAU,8BAA8B;IAC5C,IAAI;QACF,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACnD,OAAO,YAAY,CAAC,KAAK,CACvB,YAAY,CAAC,OAAO,CAAC,4BAA4B,CAAC,CACnD,CAAA;QACD,MAAM,eAAe,GAA2B,YAAY,CAC1D,4BAA4B,CAC7B,CAAA;QAED,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,MAAM,CAC5D,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CACf,0BAA0B,CAAC,QAAQ,CACjC,GAAwC,CACzC,IAAI,OAAO,CAAC,KAAK,CAAC,CACtB,CAAA;QACD,OAAO,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;KAC3C;IAAC,OAAO,GAAQ,EAAE;QACjB,IAAI,GAAG,EAAE,IAAI,KAAK,kBAAkB,IAAI,GAAG,EAAE,IAAI,KAAK,QAAQ,EAAE;YAC9D,OAAO,CAAC,GAAG,CACT,gEAAgE,CACjE,CAAA;YACD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;SAClB;QACD,sFAAsF;QACtF,OAAO,EAAE,CAAA;KACV;AACH,CAAC;AAED,SAAS,yCAAyC;IAChD,MAAM,YAAY,GAAG,8BAA8B,EAAE,CAAA;IACrD,MAAM,iBAAiB,GAAG,IAAI,eAAe,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAA;IAEtE,OAAO,iBAAiB,CAAC,CAAC,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;AACzD,CAAC;AAED,SAAS,qCAAqC,CAAC,OAA0B;IACvE,OAAO,IAAI,IAAI,eAAe,CAAC;QAC7B,UAAU,EAAE,OAAO,CAAC,UAAW;QAC/B,cAAc,EAAE,OAAO,CAAC,cAAe;KACxC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,OAA0B;IACxE,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC,CAAA;IACtE,OAAO,QAAQ;QACb,CAAC,CAAC,qCAAqC,CAAC,OAAO,CAAC;QAChD,CAAC,CAAC,yCAAyC,EAAE,CAAA;AACjD,CAAC"}
|