@shopify/shop-minis-cli 0.0.157 → 0.0.159
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/create-mini/utils/template-app.js +6 -0
- package/build/commands/create-mini/utils/template-app.js.map +1 -1
- package/build/commands/dev/index.js +2 -2
- package/build/commands/dev/index.js.map +1 -1
- package/build/commands/doctor/utils/diagnose-dependencies.d.ts +5 -4
- package/build/commands/doctor/utils/diagnose-dependencies.js +134 -60
- package/build/commands/doctor/utils/diagnose-dependencies.js.map +1 -1
- package/build/commands/generate-graphql-types/utils/get-graphql-config.js +14 -6
- package/build/commands/generate-graphql-types/utils/get-graphql-config.js.map +1 -1
- package/build/commands/generate-graphql-types/utils/get-graphql-config.spec.js +11 -6
- package/build/commands/generate-graphql-types/utils/get-graphql-config.spec.js.map +1 -1
- package/build/commands/generate-graphql-types/utils/require.d.ts +2 -0
- package/build/commands/generate-graphql-types/utils/require.js +3 -0
- package/build/commands/generate-graphql-types/utils/require.js.map +1 -0
- package/build/commands/info/index.js +4 -2
- package/build/commands/info/index.js.map +1 -1
- package/build/commands/proxies/apply.js +7 -1
- package/build/commands/proxies/apply.js.map +1 -1
- package/build/commands/submit/submit.js +7 -1
- package/build/commands/submit/submit.js.map +1 -1
- package/build/commands/submit/tasks.d.ts +1 -0
- package/build/commands/submit/tasks.js +32 -1
- package/build/commands/submit/tasks.js.map +1 -1
- package/build/commands/submit/utils/assert-core-dependencies-version.d.ts +2 -0
- package/build/commands/submit/utils/assert-core-dependencies-version.js +41 -0
- package/build/commands/submit/utils/assert-core-dependencies-version.js.map +1 -1
- package/build/commands/upgrade/index.js +20 -12
- package/build/commands/upgrade/index.js.map +1 -1
- package/build/constants/templates.d.ts +7 -0
- package/build/constants/templates.js +8 -0
- package/build/constants/templates.js.map +1 -0
- package/build/data/proxies/proxies-set.js +4 -0
- package/build/data/proxies/proxies-set.js.map +1 -1
- package/build/data/types/autogenerated/shop-minis-admin-api/gql.d.ts +2 -2
- package/build/data/types/autogenerated/shop-minis-admin-api/gql.js +1 -1
- package/build/data/types/autogenerated/shop-minis-admin-api/gql.js.map +1 -1
- package/build/data/types/autogenerated/shop-minis-admin-api/graphql.d.ts +22 -0
- package/build/data/types/autogenerated/shop-minis-admin-api/graphql.js +17 -0
- package/build/data/types/autogenerated/shop-minis-admin-api/graphql.js.map +1 -1
- package/build/utils/minis-manifest.js +3 -1
- package/build/utils/minis-manifest.js.map +1 -1
- package/build/utils/package-manager.d.ts +1 -0
- package/build/utils/package-manager.js +15 -0
- package/build/utils/package-manager.js.map +1 -1
- package/build/utils/standalone.d.ts +2 -0
- package/build/utils/standalone.js +15 -0
- package/build/utils/standalone.js.map +1 -0
- package/package.json +2 -1
- package/templates/__template_common/package.json +5 -5
|
@@ -8,6 +8,7 @@ import { CLI_VERSION } from '../../config.js';
|
|
|
8
8
|
import { replaceStringsInTemplate } from '../../../utils/replace-strings-in-template.js';
|
|
9
9
|
import { execAsync } from '../../../utils/exec-async-child-process.js';
|
|
10
10
|
import { getPackageAlphaVersionCommand, getPackageDependencyVersionCommand, getPackageLatestVersionCommand, } from '../../../utils/package-manager.js';
|
|
11
|
+
import { COMMON_PACKAGE_DEPENDENCY_VERSIONS } from '../../../constants/templates.js';
|
|
11
12
|
import { cloneShopMinisRepo, getExample } from './examples.js';
|
|
12
13
|
const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
|
|
13
14
|
export async function generateMiniFromTemplate(name, templateName, miniDir, useAlphaRuntime, useAlphaSDK) {
|
|
@@ -22,6 +23,11 @@ export async function generateMiniFromTemplate(name, templateName, miniDir, useA
|
|
|
22
23
|
__SHOP_MINIS_SDK_VERSION__: await fetchPackageVersion('@shopify/shop-minis-platform-sdk', '0.1.95', useAlphaSDK),
|
|
23
24
|
__SHOP_MINIS_UI_EXTENSIONS_VERSION__: await fetchPackageVersion('@shopify/shop-minis-ui-extensions', '0.0.4'),
|
|
24
25
|
__REACT_NATIVE_VERSION__: await getPackageDependencyVersion('@shopify/shop-minis-runtime', 'react-native', '0.73.2'),
|
|
26
|
+
__PACKAGE_VERSION_TYPES_JEST__: COMMON_PACKAGE_DEPENDENCY_VERSIONS.TYPES_JEST,
|
|
27
|
+
__PACKAGE_VERSION_BABEL_JEST__: COMMON_PACKAGE_DEPENDENCY_VERSIONS.BABEL_JEST,
|
|
28
|
+
__PACKAGE_VERSION_ESLINT__: COMMON_PACKAGE_DEPENDENCY_VERSIONS.ESLINT,
|
|
29
|
+
__PACKAGE_VERSION_JEST__: COMMON_PACKAGE_DEPENDENCY_VERSIONS.JEST,
|
|
30
|
+
__PACKAGE_VERSION_PRETTIER__: COMMON_PACKAGE_DEPENDENCY_VERSIONS.PRETTIER,
|
|
25
31
|
};
|
|
26
32
|
const commonTemplateFilesDir = await path.join(__dirname, '../../../../templates', '__template_common');
|
|
27
33
|
await copy(commonTemplateFilesDir, tmpDir);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template-app.js","sourceRoot":"","sources":["../../../../src/commands/create-mini/utils/template-app.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,UAAU,CAAA;AAC1B,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAC,MAAM,kBAAkB,CAAA;AAC7D,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,UAAU,CAAA;AACnC,OAAO,CAAC,MAAM,QAAQ,CAAA;AAEtB,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAC,wBAAwB,EAAC,MAAM,+CAA+C,CAAA;AACtF,OAAO,EAAC,SAAS,EAAC,MAAM,4CAA4C,CAAA;AACpE,OAAO,EACL,6BAA6B,EAC7B,kCAAkC,EAClC,8BAA8B,GAC/B,MAAM,mCAAmC,CAAA;
|
|
1
|
+
{"version":3,"file":"template-app.js","sourceRoot":"","sources":["../../../../src/commands/create-mini/utils/template-app.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,8 +86,8 @@ async function initialiseOptions(options) {
|
|
|
86
86
|
return { ...options, extensionTargets: extensionsToStart };
|
|
87
87
|
}
|
|
88
88
|
async function validateDependencies() {
|
|
89
|
-
const {
|
|
90
|
-
if (
|
|
89
|
+
const { areDependenciesValid } = getInvalidDependencies();
|
|
90
|
+
if (!areDependenciesValid) {
|
|
91
91
|
console.warn(chalk.yellow(`\n⚠️ There are some issues with the dependencies of your mini. Run ${chalk.bold(await getRunBinCommand('shop-minis doctor'))} for more details and instructions on how to fix them.`));
|
|
92
92
|
console.warn(chalk.yellow('⚠️ Problems with the dependencies of your mini could be a cause of rejection during the submission process\n'));
|
|
93
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/dev/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/dev/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,MAAM,CAAA;AAC9B,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AAEtC,OAAO,KAAK,MAAM,cAAc,CAAA;AAChC,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;AAClE,OAAO,CAAC,MAAM,QAAQ,CAAA;AAEtB,OAAO,EAAC,eAAe,EAAC,MAAM,+BAA+B,CAAA;AAC7D,OAAO,EAAC,iBAAiB,EAAC,MAAM,8BAA8B,CAAA;AAC9D,OAAO,EAAC,sBAAsB,EAAC,MAAM,0CAA0C,CAAA;AAC/E,OAAO,EAAC,gBAAgB,EAAC,MAAM,gCAAgC,CAAA;AAC/D,OAAO,EAAC,iBAAiB,EAAC,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAC,oBAAoB,EAAC,MAAM,2DAA2D,CAAA;AAE9F,OAAO,EAAC,mBAAmB,EAAC,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAC,QAAQ,EAAC,MAAM,+BAA+B,CAAA;AACtD,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAA;AAa1C,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,aAAsB;IACtD,MAAM,EAAE,GAAG,MAAM,UAAU,CAAC,EAAE,EAAE,CAAA;IAEhC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE;SAC1B,IAAI,CAAC,KAAK,CAAC;SACX,WAAW,CAAC,2CAA2C,CAAC;SACxD,MAAM,CAAC,eAAe,EAAE,4BAA4B,CAAC;SACrD,MAAM,CAAC,eAAe,EAAE,iBAAiB,EAAE,EAAE,CAAC;SAC9C,MAAM,CAAC,WAAW,EAAE,0BAA0B,CAAC,CAAC,0BAA0B;SAC1E,MAAM,CACL,sCAAsC,EACtC,8CAA8C,CAC/C;SACA,MAAM,CACL,2CAA2C,EAC3C,kCAAkC,CACnC;SACA,SAAS,CACR,IAAI,MAAM,CAAC,0BAA0B,EAAE,YAAY,CAAC;SACjD,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SACjC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAC9B;SACA,SAAS,CACR,IAAI,MAAM,CACR,8BAA8B,EAC9B,6DAA6D,CAC9D,CAAC,OAAO,CAAC,EAAC,SAAS,EAAE,UAAU,EAAC,CAAC,CACnC;SACA,MAAM,CAAC,UAAU,EAAE,kDAAkD,CAAC;SACtE,MAAM,CAAC,KAAK,EAAE,cAAiC,EAAE,EAAE;QAClD,IAAI;YACF,WAAW,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;YAEjE,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAA;YAEzC,IAAI;gBACF,MAAM,aAAa,CAAC,UAAU,CAAC,CAAA;aAChC;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb,mJAAmJ,CACpJ,CAAA;aACF;YAED,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,cAAc,CAAC,CAAA;YAEvD,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE;gBAClD,MAAM,IAAI,KAAK,CACb,iLAAiL,CAClL,CAAA;aACF;YAED,MAAM,EAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAC,GAAG,eAAe,EAAE,CAAA;YAE9D,WAAW,CAAC,iBAAiB,QAAQ,GAAG,CAAC,CAAA;YAEzC,MAAM,oBAAoB,EAAE,CAAA;YAE5B,iBAAiB,EAAE,CAAA,CAAC,mFAAmF;YACvG,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAA;YACvB,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM;gBACnC,CAAC,CAAC,MAAM,KAAK,CAAC,OAAO,CAAC;oBAClB,IAAI,EAAE,IAAI;oBACV,kBAAkB,EAAE,IAAI;iBACzB,CAAC;gBACJ,CAAC,CAAC,SAAS,CAAA;YAEb,OAAO,CAAC,GAAG,CACT,mCAAmC,EACnC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,EACrB,eAAe,CAChB,CAAA;YAED,MAAM,mBAAmB,GAAG,IAAI,mBAAmB,CACjD,OAAO,EACP,UAAU,IAAI,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,6EAA6E;YAClH,cAAc,CACf,CAAA;YACD,mBAAmB,CAAC,KAAK,EAAE,CAAA;YAE3B,oBAAoB,CAAC,EAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAA;SAC9D;QAAC,OAAO,GAAG,EAAE;YACZ,OAAQ,GAAa,CAAC,KAAK,CAAA,CAAC,qFAAqF;YACjH,MAAM,WAAW,CAAC,GAAG,CAAC,CAAA;SACvB;IACH,CAAC,CAAC,CAAA;IAEJ,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;AACnC,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,OAA0B;IACzD,IAAI,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,SAAS,KAAK,UAAU,EAAE;QAC/D,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CAAC,MAAM,CACf,kHAAkH,CACnH,CACF,CAAA;KACF;SAAM,IAAI,OAAO,CAAC,SAAS,KAAK,UAAU,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;QACvE,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CAAC,MAAM,CACf,6HAA6H,CAC9H,CACF,CAAA;KACF;IAED,IAAI,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAA;IAC/C,IAAI,CAAC,OAAO,CAAC,gBAAgB,IAAI,OAAO,CAAC,eAAe,EAAE;QACxD,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CAAC,MAAM,CACf,4EAA4E,CAC7E,CACF,CAAA;QACD,gBAAgB,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;KAC7C;IAED,MAAM,iBAAiB,GAAG,MAAM,iBAAiB,CAAC,gBAAgB,CAAC,CAAA;IACnE,WAAW,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAA;IAEtE,OAAO,EAAC,GAAG,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAC,CAAA;AAC1D,CAAC;AAED,KAAK,UAAU,oBAAoB;IACjC,MAAM,EAAC,oBAAoB,EAAC,GAAG,sBAAsB,EAAE,CAAA;IAEvD,IAAI,CAAC,oBAAoB,EAAE;QACzB,OAAO,CAAC,IAAI,CACV,KAAK,CAAC,MAAM,CACV,uEAAuE,KAAK,CAAC,IAAI,CAC/E,MAAM,gBAAgB,CAAC,mBAAmB,CAAC,CAC5C,wDAAwD,CAC1D,CACF,CAAA;QACD,OAAO,CAAC,IAAI,CACV,KAAK,CAAC,MAAM,CACV,+GAA+G,CAChH,CACF,CAAA;KACF;AACH,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
export declare function diagnoseDependencies(autoFix?: boolean): Promise<boolean>;
|
|
2
2
|
export declare function getInvalidDependencies(): {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
3
|
+
dependenciesToAdd: string[];
|
|
4
|
+
dependenciesToRemove: string[];
|
|
5
|
+
devDependenciesToAdd: string[];
|
|
6
|
+
devDependenciesToRemove: string[];
|
|
7
|
+
areDependenciesValid: boolean;
|
|
7
8
|
};
|
|
@@ -2,72 +2,127 @@ import path from 'path';
|
|
|
2
2
|
import fs from 'fs';
|
|
3
3
|
import { AbortError } from '@shopify/cli-kit/node/error';
|
|
4
4
|
import chalk from 'chalk';
|
|
5
|
-
import {
|
|
5
|
+
import { outputDebug } from '@shopify/cli-kit/node/output';
|
|
6
|
+
import { isStandaloneMini } from '../../../utils/standalone.js';
|
|
7
|
+
import { getPackageLatestVersion, hardResetDependencies, } from '../../../utils/package-manager.js';
|
|
6
8
|
import { wrapWithLoadingIndicator } from '../../../utils/wrap-with-loading-indicator.js';
|
|
7
|
-
|
|
9
|
+
import { COMMON_PACKAGE_DEPENDENCY_VERSIONS } from '../../../constants/templates.js';
|
|
10
|
+
const LEGACY_PLATFORM_DEPENDENCIES = [
|
|
8
11
|
'@shopify/shop-minis-runtime',
|
|
9
12
|
'@shopify/shop-minis-platform-sdk',
|
|
10
13
|
'@shopify/shop-minis-ui-extensions',
|
|
11
14
|
];
|
|
15
|
+
const STANDALONE_PLATFORM_DEPENDENCIES = ['@shopify/shop-minis-sdk'];
|
|
16
|
+
const PLATFORM_DEV_DEPENDENCIES = [
|
|
17
|
+
'@shopify/shop-minis-cli',
|
|
18
|
+
'@types/jest',
|
|
19
|
+
'babel-jest',
|
|
20
|
+
'eslint',
|
|
21
|
+
'jest',
|
|
22
|
+
'prettier',
|
|
23
|
+
];
|
|
24
|
+
const DEPENDENCY_VERSIONS = {
|
|
25
|
+
'@shopify/shop-minis-sdk': 'latest',
|
|
26
|
+
'@shopify/shop-minis-runtime': 'latest',
|
|
27
|
+
'@shopify/shop-minis-platform-sdk': 'latest',
|
|
28
|
+
'@shopify/shop-minis-ui-extensions': 'latest',
|
|
29
|
+
'@shopify/shop-minis-cli': 'latest',
|
|
30
|
+
'@types/jest': COMMON_PACKAGE_DEPENDENCY_VERSIONS.TYPES_JEST,
|
|
31
|
+
'babel-jest': COMMON_PACKAGE_DEPENDENCY_VERSIONS.BABEL_JEST,
|
|
32
|
+
eslint: COMMON_PACKAGE_DEPENDENCY_VERSIONS.ESLINT,
|
|
33
|
+
jest: COMMON_PACKAGE_DEPENDENCY_VERSIONS.JEST,
|
|
34
|
+
prettier: COMMON_PACKAGE_DEPENDENCY_VERSIONS.PRETTIER,
|
|
35
|
+
};
|
|
36
|
+
const log = (message) => {
|
|
37
|
+
if (process.env.VITEST)
|
|
38
|
+
return;
|
|
39
|
+
console.log(message);
|
|
40
|
+
};
|
|
12
41
|
export async function diagnoseDependencies(autoFix) {
|
|
13
|
-
const {
|
|
14
|
-
if (
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
42
|
+
const { areDependenciesValid, dependenciesToAdd, dependenciesToRemove, devDependenciesToAdd, devDependenciesToRemove, } = getInvalidDependencies();
|
|
43
|
+
if (!areDependenciesValid) {
|
|
44
|
+
log(chalk.red(`\n❌ Found some issues with the dependencies of your mini. Read more about supported dependencies in ${chalk.bold('https://shop.app/minis/docs/build-a-shop-mini/dependencies/')}`));
|
|
45
|
+
logDependenciesToRemove([...dependenciesToRemove]);
|
|
46
|
+
logDependenciesToRemove([...devDependenciesToRemove], true);
|
|
47
|
+
logDependenciesToAdd([...dependenciesToAdd]);
|
|
48
|
+
logDependenciesToAdd([...devDependenciesToAdd], true);
|
|
19
49
|
}
|
|
20
50
|
if (autoFix) {
|
|
21
|
-
await
|
|
51
|
+
await autoFixDependencies({
|
|
22
52
|
packageJsonPath: path.join(process.cwd(), 'package.json'),
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
53
|
+
dependenciesToAdd,
|
|
54
|
+
devDependenciesToAdd,
|
|
55
|
+
dependenciesToRemove,
|
|
56
|
+
devDependenciesToRemove,
|
|
26
57
|
});
|
|
27
58
|
}
|
|
28
|
-
else if (
|
|
59
|
+
else if (!areDependenciesValid) {
|
|
29
60
|
logTroubleshootInstructions();
|
|
30
61
|
}
|
|
31
|
-
|
|
32
|
-
return !areDependenciesInvalid;
|
|
62
|
+
return areDependenciesValid;
|
|
33
63
|
}
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
64
|
+
function getDependencies(packageJsonPath) {
|
|
65
|
+
return getPackageJsonByPath(packageJsonPath).dependencies;
|
|
66
|
+
}
|
|
67
|
+
function getDevDependencies(packageJsonPath) {
|
|
68
|
+
return getPackageJsonByPath(packageJsonPath).devDependencies;
|
|
69
|
+
}
|
|
70
|
+
function getMiniDependencies() {
|
|
40
71
|
const miniPackageJsonPath = path.join(process.cwd(), 'package.json');
|
|
41
|
-
const
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
72
|
+
const miniDependencies = getDependencies(miniPackageJsonPath);
|
|
73
|
+
const miniDevDependencies = getDevDependencies(miniPackageJsonPath);
|
|
74
|
+
return {
|
|
75
|
+
dependencies: miniDependencies,
|
|
76
|
+
devDependencies: miniDevDependencies,
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
export function getInvalidDependencies() {
|
|
80
|
+
const isStandalone = isStandaloneMini();
|
|
81
|
+
const { dependencies, devDependencies } = getMiniDependencies();
|
|
82
|
+
const miniDependencies = Object.keys(dependencies);
|
|
83
|
+
const miniDevDependencies = Object.keys(devDependencies);
|
|
84
|
+
let dependenciesToAdd = [];
|
|
85
|
+
let devDependenciesToAdd = [];
|
|
86
|
+
let dependenciesToRemove = [];
|
|
87
|
+
let devDependenciesToRemove = [];
|
|
88
|
+
if (isStandalone) {
|
|
89
|
+
dependenciesToAdd = STANDALONE_PLATFORM_DEPENDENCIES.filter(dependency => !miniDependencies.includes(dependency));
|
|
90
|
+
dependenciesToRemove = miniDependencies.filter(dependency => !STANDALONE_PLATFORM_DEPENDENCIES.includes(dependency));
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
dependenciesToAdd = LEGACY_PLATFORM_DEPENDENCIES.filter(dependency => !miniDependencies.includes(dependency));
|
|
94
|
+
dependenciesToRemove = miniDependencies.filter(dependency => !LEGACY_PLATFORM_DEPENDENCIES.includes(dependency));
|
|
95
|
+
}
|
|
96
|
+
devDependenciesToAdd = PLATFORM_DEV_DEPENDENCIES.filter(dependency => !miniDevDependencies.includes(dependency));
|
|
97
|
+
devDependenciesToRemove = miniDevDependencies.filter(dependency => !PLATFORM_DEV_DEPENDENCIES.includes(dependency));
|
|
98
|
+
const areDependenciesValid = dependenciesToAdd.length +
|
|
99
|
+
dependenciesToRemove.length +
|
|
100
|
+
devDependenciesToAdd.length +
|
|
101
|
+
devDependenciesToRemove.length ===
|
|
102
|
+
0;
|
|
51
103
|
return {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
104
|
+
dependenciesToAdd,
|
|
105
|
+
dependenciesToRemove,
|
|
106
|
+
devDependenciesToAdd,
|
|
107
|
+
devDependenciesToRemove,
|
|
108
|
+
areDependenciesValid,
|
|
56
109
|
};
|
|
57
110
|
}
|
|
58
|
-
function
|
|
111
|
+
function logDependenciesToRemove(dependencies, isDev = false) {
|
|
59
112
|
if (dependencies.length === 0) {
|
|
60
113
|
return;
|
|
61
114
|
}
|
|
62
|
-
|
|
63
|
-
dependencies.forEach(dependency =>
|
|
115
|
+
log(chalk.red(`\n❌ The following ${isDev ? 'devDependencies' : 'dependencies'} should be removed:`));
|
|
116
|
+
dependencies.forEach(dependency => log(`- ${dependency}`));
|
|
117
|
+
log(''); // Newline after the dependencies
|
|
64
118
|
}
|
|
65
|
-
function
|
|
119
|
+
function logDependenciesToAdd(dependencies, isDev = false) {
|
|
66
120
|
if (dependencies.length === 0) {
|
|
67
121
|
return;
|
|
68
122
|
}
|
|
69
|
-
|
|
70
|
-
dependencies.forEach(dependency =>
|
|
123
|
+
log(chalk.red(`\n❌ The following ${isDev ? 'devDependencies' : 'dependencies'} should be added:`));
|
|
124
|
+
dependencies.forEach(dependency => log(`- ${dependency}`));
|
|
125
|
+
log(''); // Newline after the dependencies
|
|
71
126
|
}
|
|
72
127
|
function getPackageJsonByPath(packageJsonPath) {
|
|
73
128
|
let packageJson = {};
|
|
@@ -81,36 +136,55 @@ function getPackageJsonByPath(packageJsonPath) {
|
|
|
81
136
|
return packageJson;
|
|
82
137
|
}
|
|
83
138
|
function logTroubleshootInstructions() {
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
139
|
+
log(chalk.cyan(`\nℹ️ This error is potentially fixable with the ${chalk.bold('--fix')} option.`));
|
|
140
|
+
log(chalk.cyan('\nℹ️ If you want to fix this error manually, try:'));
|
|
141
|
+
log('1. Remove the invalid dependencies and/or devDependencies from your package.json');
|
|
142
|
+
log('2. Add the missing dependencies and/or devDependencies to your package.json');
|
|
143
|
+
log('3. Remove the node_modules folder and the dependencies lockfile (package-lock.json or yarn.lock)');
|
|
144
|
+
log('4. Reinstall dependencies');
|
|
145
|
+
log('5. Commit the changes to the package.json and lockfile');
|
|
90
146
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
147
|
+
const getDependencyVersion = async (dependency) => {
|
|
148
|
+
let version = DEPENDENCY_VERSIONS[dependency];
|
|
149
|
+
if (!version || version === 'latest') {
|
|
150
|
+
version = await getPackageLatestVersion(dependency);
|
|
151
|
+
}
|
|
152
|
+
return version;
|
|
153
|
+
};
|
|
154
|
+
async function autoFixDependencies({ packageJsonPath, dependenciesToRemove = [], devDependenciesToRemove = [], dependenciesToAdd = [], devDependenciesToAdd = [], }) {
|
|
155
|
+
outputDebug('Auto fixing dependencies');
|
|
156
|
+
if (!dependenciesToRemove.length &&
|
|
157
|
+
!devDependenciesToRemove.length &&
|
|
158
|
+
!dependenciesToAdd.length &&
|
|
159
|
+
!devDependenciesToAdd.length) {
|
|
95
160
|
return;
|
|
96
161
|
}
|
|
97
162
|
const packageJson = getPackageJsonByPath(packageJsonPath);
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
});
|
|
101
|
-
duplicatedDependencies.forEach(dependency => {
|
|
163
|
+
for (const dependency of dependenciesToRemove) {
|
|
164
|
+
outputDebug(`Removing dependency ${dependency}`);
|
|
102
165
|
delete packageJson.dependencies[dependency];
|
|
103
|
-
}
|
|
104
|
-
|
|
166
|
+
}
|
|
167
|
+
for (const devDependency of devDependenciesToRemove) {
|
|
168
|
+
outputDebug(`Removing devDependency ${devDependency}`);
|
|
105
169
|
delete packageJson.devDependencies[devDependency];
|
|
106
|
-
}
|
|
170
|
+
}
|
|
171
|
+
await Promise.all(dependenciesToAdd.map(async (dependency) => {
|
|
172
|
+
const version = await getDependencyVersion(dependency);
|
|
173
|
+
outputDebug(`Adding dependency ${dependency} version ${version}`);
|
|
174
|
+
packageJson.dependencies[dependency] = version;
|
|
175
|
+
}));
|
|
176
|
+
await Promise.all(devDependenciesToAdd.map(async (devDependency) => {
|
|
177
|
+
const version = await getDependencyVersion(devDependency);
|
|
178
|
+
outputDebug(`Adding devDependency ${devDependency} version ${version}`);
|
|
179
|
+
packageJson.devDependencies[devDependency] = version;
|
|
180
|
+
}));
|
|
107
181
|
fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`, // keep the new line at the end of the file
|
|
108
182
|
{
|
|
109
183
|
encoding: 'utf-8',
|
|
110
184
|
});
|
|
111
185
|
await wrapWithLoadingIndicator(hardResetDependencies(), {
|
|
112
|
-
loadingMessage: '
|
|
113
|
-
successMessage: 'Dependencies
|
|
186
|
+
loadingMessage: 'Fixing dependencies and recreating lockfiles...',
|
|
187
|
+
successMessage: 'Dependencies fixed',
|
|
114
188
|
});
|
|
115
189
|
}
|
|
116
190
|
//# sourceMappingURL=diagnose-dependencies.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnose-dependencies.js","sourceRoot":"","sources":["../../../../src/commands/doctor/utils/diagnose-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,OAAO,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAA;AACtD,OAAO,KAAK,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"diagnose-dependencies.js","sourceRoot":"","sources":["../../../../src/commands/doctor/utils/diagnose-dependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { existsSync } from 'node:fs';
|
|
2
|
-
import {
|
|
3
|
-
import { join } from 'node:path';
|
|
2
|
+
import path, { join } from 'node:path';
|
|
4
3
|
import { outputDebug } from '@shopify/cli-kit/node/output';
|
|
5
|
-
|
|
4
|
+
import { isStandaloneMini } from '../../../utils/standalone.js';
|
|
5
|
+
import { customRequire } from './require.js';
|
|
6
|
+
const LEGACY_GRAPHQL_CONFIG_PATH = path.join(process.cwd(), 'node_modules', '@shopify', 'shop-minis-runtime', 'graphqlrc');
|
|
7
|
+
const STANDALONE_GRAPHQL_CONFIG_PATH = path.join(process.cwd(), 'node_modules', '@shopify', 'shop-minis-sdk', 'graphqlrc');
|
|
6
8
|
export function getGraphqlConfig() {
|
|
7
9
|
try {
|
|
8
10
|
let gqlConfig;
|
|
@@ -19,13 +21,19 @@ export function getGraphqlConfig() {
|
|
|
19
21
|
}
|
|
20
22
|
}
|
|
21
23
|
if (!gqlConfig) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
+
if (isStandaloneMini()) {
|
|
25
|
+
outputDebug(`Using graphql config from ${STANDALONE_GRAPHQL_CONFIG_PATH}`);
|
|
26
|
+
gqlConfig = customRequire()(STANDALONE_GRAPHQL_CONFIG_PATH);
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
outputDebug(`Using graphql config from ${LEGACY_GRAPHQL_CONFIG_PATH}`);
|
|
30
|
+
gqlConfig = customRequire()(LEGACY_GRAPHQL_CONFIG_PATH);
|
|
31
|
+
}
|
|
24
32
|
}
|
|
25
33
|
return gqlConfig;
|
|
26
34
|
}
|
|
27
35
|
catch (err) {
|
|
28
|
-
throw new Error(`Failed to load graphql config
|
|
36
|
+
throw new Error(`Failed to load graphql config. Error: ${err}`);
|
|
29
37
|
}
|
|
30
38
|
}
|
|
31
39
|
//# sourceMappingURL=get-graphql-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-graphql-config.js","sourceRoot":"","sources":["../../../../src/commands/generate-graphql-types/utils/get-graphql-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAA;AAClC,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"get-graphql-config.js","sourceRoot":"","sources":["../../../../src/commands/generate-graphql-types/utils/get-graphql-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAA;AAClC,OAAO,IAAI,EAAE,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEpC,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAA;AAExD,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAA;AAE7D,OAAO,EAAC,aAAa,EAAC,MAAM,cAAc,CAAA;AAE1C,MAAM,0BAA0B,GAAG,IAAI,CAAC,IAAI,CAC1C,OAAO,CAAC,GAAG,EAAE,EACb,cAAc,EACd,UAAU,EACV,oBAAoB,EACpB,WAAW,CACZ,CAAA;AACD,MAAM,8BAA8B,GAAG,IAAI,CAAC,IAAI,CAC9C,OAAO,CAAC,GAAG,EAAE,EACb,cAAc,EACd,UAAU,EACV,gBAAgB,EAChB,WAAW,CACZ,CAAA;AAED,MAAM,UAAU,gBAAgB;IAC9B,IAAI;QACF,IAAI,SAAS,CAAA;QACb,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,CAAC,CAAA;QAC5D,MAAM,iBAAiB,GAAG,UAAU,CAAC,eAAe,CAAC,CAAA;QACrD,WAAW,CACT,6BAA6B,eAAe,YAAY,iBAAiB,EAAE,CAC5E,CAAA;QAED,IAAI,iBAAiB,EAAE;YACrB,WAAW,CAAC,mCAAmC,eAAe,EAAE,CAAC,CAAA;YAEjE,IAAI;gBACF,SAAS,GAAG,aAAa,EAAE,CAAC,eAAe,CAAC,CAAA;aAC7C;YAAC,OAAO,GAAG,EAAE;gBACZ,WAAW,CACT,4CAA4C,eAAe,WAAW,GAAG,EAAE,CAC5E,CAAA;aACF;SACF;QAED,IAAI,CAAC,SAAS,EAAE;YACd,IAAI,gBAAgB,EAAE,EAAE;gBACtB,WAAW,CACT,6BAA6B,8BAA8B,EAAE,CAC9D,CAAA;gBACD,SAAS,GAAG,aAAa,EAAE,CAAC,8BAA8B,CAAC,CAAA;aAC5D;iBAAM;gBACL,WAAW,CAAC,6BAA6B,0BAA0B,EAAE,CAAC,CAAA;gBACtE,SAAS,GAAG,aAAa,EAAE,CAAC,0BAA0B,CAAC,CAAA;aACxD;SACF;QAED,OAAO,SAAS,CAAA;KACjB;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,EAAE,CAAC,CAAA;KAChE;AACH,CAAC"}
|
|
@@ -3,11 +3,17 @@ import { join } from 'node:path';
|
|
|
3
3
|
import { expect, describe, it, vi, afterEach } from 'vitest';
|
|
4
4
|
import { getGraphqlConfig } from './get-graphql-config.js';
|
|
5
5
|
const customRequireMock = vi.fn();
|
|
6
|
-
vi.mock('
|
|
7
|
-
|
|
6
|
+
vi.mock('./require.js', () => ({
|
|
7
|
+
customRequire: vi.fn(() => {
|
|
8
8
|
return customRequireMock;
|
|
9
9
|
}),
|
|
10
10
|
}));
|
|
11
|
+
vi.mock('../../../utils/minis-manifest.js', () => ({
|
|
12
|
+
getMiniManifestFeatures: vi.fn(() => []),
|
|
13
|
+
getMiniManifest: vi.fn(() => ({
|
|
14
|
+
handle: 'test-mini',
|
|
15
|
+
})),
|
|
16
|
+
}));
|
|
11
17
|
vi.mock('node:fs');
|
|
12
18
|
vi.mock('@shopify/cli-kit/node/output');
|
|
13
19
|
const localConfigPath = join(process.cwd(), '.graphqlrc.js');
|
|
@@ -29,7 +35,7 @@ describe('getGraphqlConfig', () => {
|
|
|
29
35
|
vi.mocked(existsSync).mockReturnValue(false);
|
|
30
36
|
vi.mocked(customRequireMock).mockReturnValue(mockConfig);
|
|
31
37
|
const result = getGraphqlConfig();
|
|
32
|
-
expect(customRequireMock).toHaveBeenCalledWith(runtimeConfigPath);
|
|
38
|
+
expect(customRequireMock).toHaveBeenCalledWith(expect.stringContaining(String(runtimeConfigPath)));
|
|
33
39
|
expect(result).toEqual(mockConfig);
|
|
34
40
|
});
|
|
35
41
|
it('uses the runtime config if the local require fails', () => {
|
|
@@ -42,8 +48,7 @@ describe('getGraphqlConfig', () => {
|
|
|
42
48
|
return mockConfig;
|
|
43
49
|
});
|
|
44
50
|
const result = getGraphqlConfig();
|
|
45
|
-
expect(customRequireMock).toHaveBeenCalledWith(
|
|
46
|
-
expect(customRequireMock).toHaveBeenCalledWith(runtimeConfigPath);
|
|
51
|
+
expect(customRequireMock).toHaveBeenCalledWith(expect.stringContaining(String(runtimeConfigPath)));
|
|
47
52
|
expect(result).toEqual(mockConfig);
|
|
48
53
|
});
|
|
49
54
|
it('should throw an error if both local and runtime configs fail to load', () => {
|
|
@@ -51,7 +56,7 @@ describe('getGraphqlConfig', () => {
|
|
|
51
56
|
vi.mocked(customRequireMock).mockImplementation(() => {
|
|
52
57
|
throw new Error('Mock error message');
|
|
53
58
|
});
|
|
54
|
-
expect(() => getGraphqlConfig()).toThrow(`Failed to load graphql config
|
|
59
|
+
expect(() => getGraphqlConfig()).toThrow(`Failed to load graphql config. Error: Error: Mock error message`);
|
|
55
60
|
});
|
|
56
61
|
});
|
|
57
62
|
//# sourceMappingURL=get-graphql-config.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-graphql-config.spec.js","sourceRoot":"","sources":["../../../../src/commands/generate-graphql-types/utils/get-graphql-config.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAA;AAClC,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAE9B,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAiB,MAAM,QAAQ,CAAA;AAE1E,OAAO,EAAC,gBAAgB,EAAC,MAAM,yBAAyB,CAAA;AAExD,MAAM,iBAAiB,GAAG,EAAE,CAAC,EAAE,EAA4C,CAAA;AAE3E,EAAE,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"get-graphql-config.spec.js","sourceRoot":"","sources":["../../../../src/commands/generate-graphql-types/utils/get-graphql-config.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAA;AAClC,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAE9B,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAiB,MAAM,QAAQ,CAAA;AAE1E,OAAO,EAAC,gBAAgB,EAAC,MAAM,yBAAyB,CAAA;AAExD,MAAM,iBAAiB,GAAG,EAAE,CAAC,EAAE,EAA4C,CAAA;AAE3E,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7B,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE;QACxB,OAAO,iBAAiB,CAAA;IAC1B,CAAC,CAAC;CACH,CAAC,CAAC,CAAA;AAEH,EAAE,CAAC,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE,CAAC,CAAC;IACjD,uBAAuB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;IACxC,eAAe,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5B,MAAM,EAAE,WAAW;KACpB,CAAC,CAAC;CACJ,CAAC,CAAC,CAAA;AAEH,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;AAClB,EAAE,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;AAEvC,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,CAAC,CAAA;AAC5D,MAAM,iBAAiB,GAAG,uCAAuC,CAAA;AAEjE,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAA;IACpB,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,UAAU,GAAG,EAAC,KAAK,EAAE,QAAQ,EAAC,CAAA;QAEpC,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAC3C,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;QAExD,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAA;QAEjC,MAAM,CAAC,iBAAiB,CAAC,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAA;QAC/D,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,UAAU,GAAG,EAAC,OAAO,EAAE,QAAQ,EAAC,CAAA;QAEtC,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;QAC5C,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;QAExD,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAA;QAEjC,MAAM,CAAC,iBAAiB,CAAC,CAAC,oBAAoB,CAC5C,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CACnD,CAAA;QACD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,UAAU,GAAG,EAAC,OAAO,EAAE,QAAQ,EAAC,CAAA;QAEtC,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAC3C,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE;YAC5D,IAAI,WAAW,KAAK,eAAe,EAAE;gBACnC,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;aACrD;YACD,OAAO,UAAU,CAAA;QACnB,CAAC,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAA;QAEjC,MAAM,CAAC,iBAAiB,CAAC,CAAC,oBAAoB,CAC5C,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CACnD,CAAA;QACD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;QAC9E,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAC3C,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE;YACnD,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;QACvC,CAAC,CAAC,CAAA;QAEF,MAAM,CAAC,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAAC,CAAC,OAAO,CACtC,iEAAiE,CAClE,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"require.js","sourceRoot":"","sources":["../../../../src/commands/generate-graphql-types/utils/require.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAA;AAEzC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA"}
|
|
@@ -21,17 +21,19 @@ export const command = new Command()
|
|
|
21
21
|
getPackageVersion('@shopify/shop-minis-cli'),
|
|
22
22
|
getPackageVersion('@shopify/shop-minis-platform-sdk'),
|
|
23
23
|
getPackageVersion('@shopify/shop-minis-runtime'),
|
|
24
|
+
getPackageVersion('@shopify/shop-minis-sdk'),
|
|
24
25
|
getPackageVersion('react'),
|
|
25
26
|
getPackageVersion('react-native'),
|
|
26
27
|
];
|
|
27
|
-
const [info, cliVersion,
|
|
28
|
+
const [info, cliVersion, legacySdkVersion, runtimeVersion, standaloneSdkVersion, reactVersion, reactNativeVersion,] = await wrapWithLoadingIndicator(Promise.all([infoPromise, ...packageVersionPromises]), {
|
|
28
29
|
loadingMessage: 'Fetching system information...',
|
|
29
30
|
successMessage: 'System information loaded',
|
|
30
31
|
});
|
|
31
32
|
console.log(`${info} Packages:`);
|
|
32
33
|
console.log(` @shopify/shop-minis-cli: ${cliVersion}`);
|
|
33
|
-
console.log(` @shopify/shop-minis-platform-sdk: ${
|
|
34
|
+
console.log(` @shopify/shop-minis-platform-sdk: ${legacySdkVersion}`);
|
|
34
35
|
console.log(` @shopify/shop-minis-runtime: ${runtimeVersion}`);
|
|
36
|
+
console.log(` @shopify/shop-minis-sdk: ${standaloneSdkVersion}`);
|
|
35
37
|
console.log(` react: ${reactVersion}`);
|
|
36
38
|
console.log(` react-native: ${reactNativeVersion}`);
|
|
37
39
|
console.log(''); // empty line at the end
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/info/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,OAAO,MAAM,SAAS,CAAA;AAE7B,OAAO,EAAC,wBAAwB,EAAC,MAAM,4CAA4C,CAAA;AACnF,OAAO,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAA;AAEhE,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE;KACjC,IAAI,CAAC,MAAM,CAAC;KACZ,WAAW,CAAC,6DAA6D,CAAC;KAC1E,MAAM,CAAC,WAAW,EAAE,0BAA0B,CAAC;KAC/C,MAAM,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;QAC9B,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC;QACxC,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC;QAC7C,IAAI,EAAE,CAAC,OAAO,EAAE,gBAAgB,CAAC;QACjC,QAAQ,EAAE,CAAC,WAAW,CAAC;QACvB,SAAS,EAAE,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC;KACjC,CAAC,CAAA;IAEF,gHAAgH;IAChH,kEAAkE;IAClE,MAAM,sBAAsB,GAAG;QAC7B,iBAAiB,CAAC,yBAAyB,CAAC;QAC5C,iBAAiB,CAAC,kCAAkC,CAAC;QACrD,iBAAiB,CAAC,6BAA6B,CAAC;QAChD,iBAAiB,CAAC,OAAO,CAAC;QAC1B,iBAAiB,CAAC,cAAc,CAAC;KACzB,CAAA;IAEV,MAAM,CACJ,IAAI,EACJ,UAAU,EACV,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/info/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,OAAO,MAAM,SAAS,CAAA;AAE7B,OAAO,EAAC,wBAAwB,EAAC,MAAM,4CAA4C,CAAA;AACnF,OAAO,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAA;AAEhE,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE;KACjC,IAAI,CAAC,MAAM,CAAC;KACZ,WAAW,CAAC,6DAA6D,CAAC;KAC1E,MAAM,CAAC,WAAW,EAAE,0BAA0B,CAAC;KAC/C,MAAM,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;QAC9B,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC;QACxC,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC;QAC7C,IAAI,EAAE,CAAC,OAAO,EAAE,gBAAgB,CAAC;QACjC,QAAQ,EAAE,CAAC,WAAW,CAAC;QACvB,SAAS,EAAE,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC;KACjC,CAAC,CAAA;IAEF,gHAAgH;IAChH,kEAAkE;IAClE,MAAM,sBAAsB,GAAG;QAC7B,iBAAiB,CAAC,yBAAyB,CAAC;QAC5C,iBAAiB,CAAC,kCAAkC,CAAC;QACrD,iBAAiB,CAAC,6BAA6B,CAAC;QAChD,iBAAiB,CAAC,yBAAyB,CAAC;QAC5C,iBAAiB,CAAC,OAAO,CAAC;QAC1B,iBAAiB,CAAC,cAAc,CAAC;KACzB,CAAA;IAEV,MAAM,CACJ,IAAI,EACJ,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,oBAAoB,EACpB,YAAY,EACZ,kBAAkB,EACnB,GAAG,MAAM,wBAAwB,CAChC,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,GAAG,sBAAsB,CAAC,CAAC,EACrD;QACE,cAAc,EAAE,gCAAgC;QAChD,cAAc,EAAE,2BAA2B;KAC5C,CACF,CAAA;IAED,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,aAAa,CAAC,CAAA;IACjC,OAAO,CAAC,GAAG,CAAC,gCAAgC,UAAU,EAAE,CAAC,CAAA;IACzD,OAAO,CAAC,GAAG,CAAC,yCAAyC,gBAAgB,EAAE,CAAC,CAAA;IACxE,OAAO,CAAC,GAAG,CAAC,oCAAoC,cAAc,EAAE,CAAC,CAAA;IACjE,OAAO,CAAC,GAAG,CAAC,gCAAgC,oBAAoB,EAAE,CAAC,CAAA;IACnE,OAAO,CAAC,GAAG,CAAC,cAAc,YAAY,EAAE,CAAC,CAAA;IACzC,OAAO,CAAC,GAAG,CAAC,qBAAqB,kBAAkB,EAAE,CAAC,CAAA;IACtD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA,CAAC,wBAAwB;AAC1C,CAAC,CAAC,CAAA;AAEJ,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,aAAsB;IACtD,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;AACnC,CAAC"}
|
|
@@ -44,9 +44,15 @@ export const command = new Command()
|
|
|
44
44
|
});
|
|
45
45
|
if (!shouldContinue)
|
|
46
46
|
return;
|
|
47
|
-
await proxiesSet({
|
|
47
|
+
const result = await proxiesSet({
|
|
48
48
|
proxies: manifestProxiesToRemoteProxies(localProxies),
|
|
49
49
|
});
|
|
50
|
+
if (result.proxiesSet.userErrors.length > 0) {
|
|
51
|
+
throw new AbortError('Proxy configuration invalid. Errors:', result.proxiesSet.userErrors.map(error => error.message).join('\n'), [
|
|
52
|
+
['Please fix the above issues in your', { bold: 'manifest.json' }],
|
|
53
|
+
'Try again and if the issue continues, contact us.',
|
|
54
|
+
]);
|
|
55
|
+
}
|
|
50
56
|
}
|
|
51
57
|
catch (error) {
|
|
52
58
|
handleError(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/commands/proxies/apply.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,EAAC,wBAAwB,EAAE,UAAU,EAAC,MAAM,0BAA0B,CAAA;AAC7E,OAAO,EAAC,UAAU,EAAE,OAAO,IAAI,WAAW,EAAC,MAAM,6BAA6B,CAAA;AAE9E,OAAO,EAAC,oBAAoB,EAAC,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAC,WAAW,EAAC,MAAM,oCAAoC,CAAA;AAC9D,OAAO,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAA;AAC9D,OAAO,EACL,eAAe,EACf,8BAA8B,EAC9B,WAAW,EACX,8BAA8B,GAC/B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAC,UAAU,EAAC,MAAM,mCAAmC,CAAA;AAE5D,MAAM,UAAU,mBAAmB;IACjC,MAAM,EAAC,KAAK,EAAE,MAAM,EAAC,GAAG,gBAAgB,EAAE,CAAA;IAE1C,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,UAAU,CAClB,2BAA2B,EAC3B,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAC9C;YACE,CAAC,8BAA8B,EAAE,EAAC,IAAI,EAAE,eAAe,EAAC,CAAC;YACzD,mDAAmD;SACpD,CACF,CAAA;KACF;AACH,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE;KACjC,IAAI,CAAC,OAAO,CAAC;KACb,WAAW,CAAC,wBAAwB,CAAC;KACrC,MAAM,CAAC,KAAK,IAAI,EAAE;IACjB,IAAI;QACF,MAAM,oBAAoB,EAAE,CAAA;QAC5B,mBAAmB,EAAE,CAAA;QAErB,uEAAuE;QACvE,uEAAuE;QACvE,MAAM,aAAa,GAAG,8BAA8B,CAAC,MAAM,WAAW,EAAE,CAAC,CAAA;QACzE,MAAM,YAAY,GAAG,eAAe,EAAE,CAAA;QACtC,MAAM,EAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAC,GAAG,WAAW,CAC/C,aAAa,EACb,YAAY,CACb,CAAA;QAED,IAAI,OAAO,GACT,yHAAyH,CAAA;QAE3H,kFAAkF;QAClF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,OAAO,GAAG,kBAAkB,CAAA;SAC7B;aAAM;YACL,UAAU,CAAC;gBACT,QAAQ,EAAE,8BAA8B;gBACxC,IAAI,EAAE,CAAC,UAAU,CAAC;aACnB,CAAC,CAAA;SACH;QAED,MAAM,cAAc,GAAG,MAAM,wBAAwB,CAAC;YACpD,YAAY,EAAE,KAAK;YACnB,OAAO,EAAE,CAAC,GAAG,OAAO,sCAAsC,CAAC;SAC5D,CAAC,CAAA;QAEF,IAAI,CAAC,cAAc;YAAE,OAAM;QAE3B,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/commands/proxies/apply.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,EAAC,wBAAwB,EAAE,UAAU,EAAC,MAAM,0BAA0B,CAAA;AAC7E,OAAO,EAAC,UAAU,EAAE,OAAO,IAAI,WAAW,EAAC,MAAM,6BAA6B,CAAA;AAE9E,OAAO,EAAC,oBAAoB,EAAC,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAC,WAAW,EAAC,MAAM,oCAAoC,CAAA;AAC9D,OAAO,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAA;AAC9D,OAAO,EACL,eAAe,EACf,8BAA8B,EAC9B,WAAW,EACX,8BAA8B,GAC/B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAC,UAAU,EAAC,MAAM,mCAAmC,CAAA;AAE5D,MAAM,UAAU,mBAAmB;IACjC,MAAM,EAAC,KAAK,EAAE,MAAM,EAAC,GAAG,gBAAgB,EAAE,CAAA;IAE1C,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,UAAU,CAClB,2BAA2B,EAC3B,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAC9C;YACE,CAAC,8BAA8B,EAAE,EAAC,IAAI,EAAE,eAAe,EAAC,CAAC;YACzD,mDAAmD;SACpD,CACF,CAAA;KACF;AACH,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE;KACjC,IAAI,CAAC,OAAO,CAAC;KACb,WAAW,CAAC,wBAAwB,CAAC;KACrC,MAAM,CAAC,KAAK,IAAI,EAAE;IACjB,IAAI;QACF,MAAM,oBAAoB,EAAE,CAAA;QAC5B,mBAAmB,EAAE,CAAA;QAErB,uEAAuE;QACvE,uEAAuE;QACvE,MAAM,aAAa,GAAG,8BAA8B,CAAC,MAAM,WAAW,EAAE,CAAC,CAAA;QACzE,MAAM,YAAY,GAAG,eAAe,EAAE,CAAA;QACtC,MAAM,EAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAC,GAAG,WAAW,CAC/C,aAAa,EACb,YAAY,CACb,CAAA;QAED,IAAI,OAAO,GACT,yHAAyH,CAAA;QAE3H,kFAAkF;QAClF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,OAAO,GAAG,kBAAkB,CAAA;SAC7B;aAAM;YACL,UAAU,CAAC;gBACT,QAAQ,EAAE,8BAA8B;gBACxC,IAAI,EAAE,CAAC,UAAU,CAAC;aACnB,CAAC,CAAA;SACH;QAED,MAAM,cAAc,GAAG,MAAM,wBAAwB,CAAC;YACpD,YAAY,EAAE,KAAK;YACnB,OAAO,EAAE,CAAC,GAAG,OAAO,sCAAsC,CAAC;SAC5D,CAAC,CAAA;QAEF,IAAI,CAAC,cAAc;YAAE,OAAM;QAE3B,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;YAC9B,OAAO,EAAE,8BAA8B,CAAC,YAAY,CAAC;SACtD,CAAC,CAAA;QAEF,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3C,MAAM,IAAI,UAAU,CAClB,sCAAsC,EACtC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EACnE;gBACE,CAAC,qCAAqC,EAAE,EAAC,IAAI,EAAE,eAAe,EAAC,CAAC;gBAChE,mDAAmD;aACpD,CACF,CAAA;SACF;KACF;IAAC,OAAO,KAAK,EAAE;QACd,WAAW,CAAC,KAAK,CAAC,CAAA;KACnB;AACH,CAAC,CAAC,CAAA"}
|
|
@@ -8,7 +8,7 @@ import { getRunBinCommand } from '../../utils/package-manager.js';
|
|
|
8
8
|
import { assertNetworkAndAuth } from '../../utils/common-tasks.js';
|
|
9
9
|
import { getMiniManifest } from '../../utils/minis-manifest.js';
|
|
10
10
|
import { validateDescription } from './validation.js';
|
|
11
|
-
import { assertManifestValid, assertNoPendingSubmissions, createStagedUpload, createSubmission, packageShopMini, uploadSubmission, } from './tasks.js';
|
|
11
|
+
import { assertManifestValid, assertNoPendingSubmissions, assertRequiredAssets, createStagedUpload, createSubmission, packageShopMini, uploadSubmission, } from './tasks.js';
|
|
12
12
|
import { generateSubmissionArchiveFilename, getSubmissionArchivePath, } from './config.js';
|
|
13
13
|
import { assertCoreDependenciesVersion } from './utils/assert-core-dependencies-version.js';
|
|
14
14
|
import { requestEntryPointParams } from './utils/request-entry-point-params.js';
|
|
@@ -84,6 +84,12 @@ export const preSubmitChecks = async () => {
|
|
|
84
84
|
await assertManifestValid();
|
|
85
85
|
},
|
|
86
86
|
},
|
|
87
|
+
{
|
|
88
|
+
title: `Checking for required assets`,
|
|
89
|
+
task: async () => {
|
|
90
|
+
await assertRequiredAssets();
|
|
91
|
+
},
|
|
92
|
+
},
|
|
87
93
|
];
|
|
88
94
|
try {
|
|
89
95
|
await renderTasks(tasks);
|