@shopify/shop-minis-cli 0.0.208 → 0.0.210
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/doctor/index.js +7 -5
- package/build/commands/doctor/index.js.map +1 -1
- package/build/commands/setup/index.js +2 -2
- package/build/commands/setup/index.js.map +1 -1
- package/build/commands/submit/submit.js +3 -3
- package/build/commands/submit/submit.js.map +1 -1
- package/build/commands/upgrade/index.js +4 -17
- package/build/commands/upgrade/index.js.map +1 -1
- package/build/utils/allowed-dependencies.js +2 -0
- package/build/utils/allowed-dependencies.js.map +1 -1
- package/build/utils/core-dependencies.d.ts +9 -0
- package/build/utils/core-dependencies.js +84 -0
- package/build/utils/core-dependencies.js.map +1 -0
- package/package.json +1 -1
- package/build/commands/submit/utils/assert-core-dependencies-version.d.ts +0 -1
- package/build/commands/submit/utils/assert-core-dependencies-version.js +0 -50
- package/build/commands/submit/utils/assert-core-dependencies-version.js.map +0 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
2
|
import { handler as handleError } from '@shopify/cli-kit/node/error';
|
|
3
3
|
import { checkDependencies, fixDependencies } from '../../utils/dependencies.js';
|
|
4
|
+
import { assertCorePackageVersions, upgradeCorePackages, } from '../../utils/core-dependencies.js';
|
|
4
5
|
export const command = new Command()
|
|
5
6
|
.name('doctor')
|
|
6
7
|
.description('Diagnose and fix common Node.js, iOS and Android issues.')
|
|
@@ -8,16 +9,17 @@ export const command = new Command()
|
|
|
8
9
|
.option('--fix', 'Attempt to fix all diagnosed issues automatically.')
|
|
9
10
|
.action(async (options) => {
|
|
10
11
|
try {
|
|
11
|
-
|
|
12
|
+
// Manage core packages (check or fix based on --fix flag)
|
|
12
13
|
if (options.fix) {
|
|
14
|
+
await upgradeCorePackages();
|
|
13
15
|
await fixDependencies();
|
|
14
16
|
}
|
|
15
17
|
else {
|
|
18
|
+
await assertCorePackageVersions();
|
|
16
19
|
const hasIssues = await checkDependencies();
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
console.log('\n✅ The configuration for your mini is correct.');
|
|
20
|
+
if (!hasIssues) {
|
|
21
|
+
console.log('\n✅ The configuration for your mini is correct.');
|
|
22
|
+
}
|
|
21
23
|
}
|
|
22
24
|
}
|
|
23
25
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/doctor/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,MAAM,6BAA6B,CAAA;AAElE,OAAO,EAAC,iBAAiB,EAAE,eAAe,EAAC,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/doctor/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,MAAM,6BAA6B,CAAA;AAElE,OAAO,EAAC,iBAAiB,EAAE,eAAe,EAAC,MAAM,6BAA6B,CAAA;AAC9E,OAAO,EACL,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,kCAAkC,CAAA;AAOzC,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE;KACjC,IAAI,CAAC,QAAQ,CAAC;KACd,WAAW,CAAC,0DAA0D,CAAC;KACvE,MAAM,CAAC,WAAW,EAAE,2BAA2B,CAAC;KAChD,MAAM,CAAC,OAAO,EAAE,oDAAoD,CAAC;KACrE,MAAM,CAAC,KAAK,EAAE,OAA0B,EAAE,EAAE;IAC3C,IAAI;QACF,0DAA0D;QAC1D,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,MAAM,mBAAmB,EAAE,CAAA;YAC3B,MAAM,eAAe,EAAE,CAAA;SACxB;aAAM;YACL,MAAM,yBAAyB,EAAE,CAAA;YAEjC,MAAM,SAAS,GAAG,MAAM,iBAAiB,EAAE,CAAA;YAC3C,IAAI,CAAC,SAAS,EAAE;gBACd,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAA;aAC/D;SACF;KACF;IAAC,OAAO,KAAK,EAAE;QACd,WAAW,CAAC,KAAK,CAAC,CAAA;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAChB;AACH,CAAC,CAAC,CAAA"}
|
|
@@ -7,12 +7,12 @@ import { getMiniManifest } from '../../utils/minis-manifest.js';
|
|
|
7
7
|
import { fetchAllOrgs, token } from '../../data/partners/query.js';
|
|
8
8
|
import { miniCreate } from '../../data/mini-create.js';
|
|
9
9
|
import { syncManifest } from '../../utils/sync-manifest.js';
|
|
10
|
-
import {
|
|
10
|
+
import { assertCorePackageVersions } from '../../utils/core-dependencies.js';
|
|
11
11
|
async function loginAndSetup(skipDependencyCheck = false) {
|
|
12
12
|
// Check dependency versions first
|
|
13
13
|
if (!skipDependencyCheck) {
|
|
14
14
|
try {
|
|
15
|
-
await
|
|
15
|
+
await assertCorePackageVersions();
|
|
16
16
|
}
|
|
17
17
|
catch (error) {
|
|
18
18
|
renderError({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/setup/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,MAAM,SAAS,CAAA;AAExB,OAAO,EAAC,OAAO,EAAE,MAAM,EAAC,MAAM,WAAW,CAAA;AACzC,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,WAAW,GACZ,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAC,UAAU,EAAE,OAAO,IAAI,WAAW,EAAC,MAAM,6BAA6B,CAAA;AAE9E,OAAO,EAAC,eAAe,EAAC,MAAM,+BAA+B,CAAA;AAC7D,OAAO,EAAC,YAAY,EAAE,KAAK,EAAC,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAC,UAAU,EAAC,MAAM,2BAA2B,CAAA;AACpD,OAAO,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAA;AACzD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/setup/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,11 +6,11 @@ import { edit } from 'external-editor';
|
|
|
6
6
|
import { handler as handleError, AbortError } from '@shopify/cli-kit/node/error';
|
|
7
7
|
import { getRunBinCommand } from '../../utils/package-manager.js';
|
|
8
8
|
import { assertNetworkAndAuth } from '../../utils/common-tasks.js';
|
|
9
|
+
import { assertCorePackageVersions } from '../../utils/core-dependencies.js';
|
|
9
10
|
import { ALLOWED_EXTENSIONS, ALLOWED_FILES, } from '../../constants/allowed-extensions.js';
|
|
10
11
|
import { validateDescription } from './validation.js';
|
|
11
12
|
import { assertManifestValid, assertNoPendingSubmissions, assertRequiredAssets, createStagedUpload, createSubmission, packageShopMini, uploadSubmission, } from './tasks.js';
|
|
12
13
|
import { generateSubmissionArchiveFilename, getSubmissionArchivePath, } from './config.js';
|
|
13
|
-
import { assertDependencyVersions } from './utils/assert-core-dependencies-version.js';
|
|
14
14
|
const execAsync = promisify(exec);
|
|
15
15
|
// Helper to create consistent dependency error messages
|
|
16
16
|
const createDependencyError = (title, message, fixCommand, checkCommand) => {
|
|
@@ -37,7 +37,7 @@ export const codeBuildChecks = async ({ skipDependencyCheck = false, skipTypescr
|
|
|
37
37
|
title: `Checking if dependencies are up to date`,
|
|
38
38
|
task: async () => {
|
|
39
39
|
try {
|
|
40
|
-
await
|
|
40
|
+
await assertCorePackageVersions();
|
|
41
41
|
}
|
|
42
42
|
catch (error) {
|
|
43
43
|
// Core dependency version check failed - need upgrade, not install --check
|
|
@@ -148,7 +148,7 @@ async function promptForDescription(predefinedDescription) {
|
|
|
148
148
|
## Video URL (required for first submission and significant changes)
|
|
149
149
|
|
|
150
150
|
Include a link to a video demonstrating the Mini's functionality.
|
|
151
|
-
|
|
151
|
+
|
|
152
152
|
## Step-by-step testing instructions (required)
|
|
153
153
|
|
|
154
154
|
For example:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"submit.js","sourceRoot":"","sources":["../../../src/commands/submit/submit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,MAAM,CAAA;AAC9B,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAElC,OAAO,EACL,aAAa,EACb,WAAW,EACX,wBAAwB,GAEzB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAC,UAAU,EAAE,WAAW,EAAE,UAAU,EAAC,MAAM,8BAA8B,CAAA;AAChF,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAA;AACpC,OAAO,EAAC,OAAO,IAAI,WAAW,EAAE,UAAU,EAAC,MAAM,6BAA6B,CAAA;AAE9E,OAAO,EAAC,gBAAgB,EAAC,MAAM,gCAAgC,CAAA;AAC/D,OAAO,EAAC,oBAAoB,EAAC,MAAM,6BAA6B,CAAA;AAChE,OAAO,EACL,kBAAkB,EAClB,aAAa,GACd,MAAM,uCAAuC,CAAA;AAQ9C,OAAO,EAAC,mBAAmB,EAAC,MAAM,iBAAiB,CAAA;AACnD,OAAO,EACL,mBAAmB,EACnB,0BAA0B,EAC1B,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,EACf,gBAAgB,GACjB,MAAM,YAAY,CAAA;AACnB,OAAO,EACL,iCAAiC,EACjC,wBAAwB,GACzB,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"submit.js","sourceRoot":"","sources":["../../../src/commands/submit/submit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { execSync } from 'child_process';
|
|
2
|
-
import semver from 'semver';
|
|
3
2
|
import { Command } from 'commander';
|
|
4
3
|
import { outputDebug } from '@shopify/cli-kit/node/output';
|
|
5
4
|
import { renderSuccess, renderError } from '@shopify/cli-kit/node/ui';
|
|
6
5
|
import { getMiniManifest } from '../../utils/minis-manifest.js';
|
|
7
6
|
import { CURRENT_CLI_VERSION } from '../config.js';
|
|
8
|
-
import { getRunBinCommand, getPackageVersion,
|
|
7
|
+
import { getRunBinCommand, getPackageVersion, } from '../../utils/package-manager.js';
|
|
9
8
|
import { fixDependencies } from '../../utils/dependencies.js';
|
|
9
|
+
import { upgradeCorePackages } from '../../utils/core-dependencies.js';
|
|
10
10
|
export const command = new Command()
|
|
11
11
|
.name('upgrade')
|
|
12
12
|
.description('Upgrade your Shop Mini configuration to the latest version.')
|
|
@@ -19,21 +19,8 @@ export const command = new Command()
|
|
|
19
19
|
const { codemod } = args;
|
|
20
20
|
outputDebug(`Upgrade args ${JSON.stringify(args)}`);
|
|
21
21
|
outputDebug(`Upgrading mini "${miniName}" at ${process.cwd()}`);
|
|
22
|
-
// Step 1: Upgrade CLI
|
|
23
|
-
|
|
24
|
-
if (semver.valid(latestCliVersion) &&
|
|
25
|
-
!semver.gte(CURRENT_CLI_VERSION, latestCliVersion)) {
|
|
26
|
-
outputDebug(`Upgrading CLI from ${CURRENT_CLI_VERSION} to ${latestCliVersion}`);
|
|
27
|
-
await installPackages([`@shopify/shop-minis-cli@${latestCliVersion}`], true);
|
|
28
|
-
}
|
|
29
|
-
// Step 2: Upgrade @shopify/shop-minis-react SDK to latest version
|
|
30
|
-
const currentReactVersion = await getPackageVersion('@shopify/shop-minis-react');
|
|
31
|
-
const latestReactVersion = await getPackageLatestVersion('@shopify/shop-minis-react');
|
|
32
|
-
if (semver.valid(latestReactVersion) &&
|
|
33
|
-
!semver.gte(currentReactVersion, latestReactVersion)) {
|
|
34
|
-
outputDebug(`Upgrading @shopify/shop-minis-react from ${currentReactVersion} to ${latestReactVersion}`);
|
|
35
|
-
await installPackages([`@shopify/shop-minis-react@${latestReactVersion}`], true);
|
|
36
|
-
}
|
|
22
|
+
// Step 1 & 2: Upgrade core packages (CLI and React)
|
|
23
|
+
await upgradeCorePackages();
|
|
37
24
|
// Step 3: Fix dependencies
|
|
38
25
|
await fixDependencies();
|
|
39
26
|
const updatedCLIVersion = await getPackageVersion('@shopify/shop-minis-cli');
|
|
@@ -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,
|
|
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;AACxD,OAAO,EAAC,aAAa,EAAE,WAAW,EAAC,MAAM,0BAA0B,CAAA;AAEnE,OAAO,EAAC,eAAe,EAAC,MAAM,+BAA+B,CAAA;AAC7D,OAAO,EAAC,mBAAmB,EAAC,MAAM,cAAc,CAAA;AAChD,OAAO,EACL,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAC,eAAe,EAAC,MAAM,6BAA6B,CAAA;AAC3D,OAAO,EAAC,mBAAmB,EAAC,MAAM,kCAAkC,CAAA;AAapE,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE;KACjC,IAAI,CAAC,SAAS,CAAC;KACf,WAAW,CAAC,6DAA6D,CAAC;KAC1E,MAAM,CAAC,WAAW,EAAE,2BAA2B,CAAC;KAChD,MAAM,CAAC,UAAU,EAAE,oDAAoD,CAAC;KACxE,MAAM,CAAC,cAAc,EAAE,iDAAiD,CAAC;KACzE,MAAM,CAAC,KAAK,EAAE,IAAwB,EAAE,EAAE;IACzC,IAAI;QACF,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC,IAAI,CAAA;QACvC,MAAM,EAAC,OAAO,EAAC,GAAG,IAAI,CAAA;QAEtB,WAAW,CAAC,gBAAgB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACnD,WAAW,CAAC,mBAAmB,QAAQ,QAAQ,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;QAE/D,oDAAoD;QACpD,MAAM,mBAAmB,EAAE,CAAA;QAE3B,2BAA2B;QAC3B,MAAM,eAAe,EAAE,CAAA;QAEvB,MAAM,iBAAiB,GAAG,MAAM,iBAAiB,CAC/C,yBAAyB,CAC1B,CAAA;QACD,MAAM,mBAAmB,GAAG,MAAM,iBAAiB,CACjD,2BAA2B,CAC5B,CAAA;QAED,WAAW,CAAC,wBAAwB,iBAAiB,EAAE,CAAC,CAAA;QACxD,WAAW,CACT,8CAA8C,mBAAmB,EAAE,CACpE,CAAA;QAED,uDAAuD;QACvD,IAAI,OAAO,IAAI,mBAAmB,KAAK,iBAAiB,EAAE;YACxD,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAC3C,oBAAoB,EACpB;gBACE,kBAAkB,mBAAmB,EAAE;gBACvC,gBAAgB,iBAAiB,EAAE;gBACnC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;gBACpB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;aAChC,CAAC,MAAM,CAAC,OAAO,CAAC,CAClB,CAAA;YACD,QAAQ,CAAC,cAAc,EAAE,EAAC,KAAK,EAAE,SAAS,EAAC,CAAC,CAAA;SAC7C;QAED,sBAAsB;QACtB,aAAa,CAAC;YACZ,QAAQ,EAAE,gCAAgC;SAC3C,CAAC,CAAA;KACH;IAAC,OAAO,KAAU,EAAE;QACnB,OAAQ,KAAe,CAAC,KAAK,CAAA;QAC7B,WAAW,CAAC,KAAK,CAAC,CAAA;KACnB;AACH,CAAC,CAAC,CAAA;AAEJ,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,aAAsB;IACtD,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;AACnC,CAAC"}
|
|
@@ -46,6 +46,8 @@ export const OPTIONAL_DEPENDENCIES = {
|
|
|
46
46
|
'@apollo/client': '4.0.7',
|
|
47
47
|
'graphql-ws': '6.0.6',
|
|
48
48
|
'@mux/mux-player-react': '3.8.0',
|
|
49
|
+
'@mediapipe/tasks-vision': '0.10.9',
|
|
50
|
+
'hls.js': '1.6.14',
|
|
49
51
|
};
|
|
50
52
|
export const ALLOWED_DEPENDENCIES = {
|
|
51
53
|
...REQUIRED_DEPENDENCIES,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"allowed-dependencies.js","sourceRoot":"","sources":["../../src/utils/allowed-dependencies.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,8DAA8D;AAC9D,mDAAmD;AAEnD,MAAM,CAAC,MAAM,qBAAqB,GAA2B;IAC3D,2BAA2B,EAAE,GAAG;IAChC,KAAK,EAAE,QAAQ;IACf,WAAW,EAAE,QAAQ;CACtB,CAAA;AAED,MAAM,CAAC,MAAM,qBAAqB,GAA2B;IAC3D,gBAAgB,EAAE,OAAO;IACzB,iBAAiB,EAAE,gBAAgB;IACnC,oBAAoB,EAAE,QAAQ;IAC9B,MAAM,EAAE,OAAO;IACf,eAAe,EAAE,OAAO;IACxB,SAAS,EAAE,OAAO;IAClB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,SAAS;IACjB,cAAc,EAAE,SAAS;IACzB,MAAM,EAAE,SAAS;IACjB,UAAU,EAAE,OAAO;IACnB,cAAc,EAAE,OAAO;IACvB,kBAAkB,EAAE,OAAO;IAC3B,UAAU,EAAE,QAAQ;IACpB,IAAI,EAAE,OAAO;IACb,OAAO,EAAE,OAAO;IAChB,uBAAuB,EAAE,QAAQ;IACjC,EAAE,EAAE,QAAQ;IACZ,gBAAgB,EAAE,QAAQ;IAC1B,eAAe,EAAE,QAAQ;IACzB,kBAAkB,EAAE,QAAQ;IAC5B,4BAA4B,EAAE,OAAO;IACrC,sBAAsB,EAAE,OAAO;IAC/B,yBAAyB,EAAE,OAAO;IAClC,4BAA4B,EAAE,OAAO;IACrC,4BAA4B,EAAE,OAAO;IACrC,4BAA4B,EAAE,OAAO;IACrC,qBAAqB,EAAE,OAAO;IAC9B,eAAe,EAAE,OAAO;IACxB,oBAAoB,EAAE,OAAO;IAC7B,mBAAmB,EAAE,QAAQ;IAC7B,kBAAkB,EAAE,OAAO;IAC3B,mBAAmB,EAAE,OAAO;IAC5B,YAAY,EAAE,OAAO;IACrB,aAAa,EAAE,SAAS;IACxB,GAAG,EAAE,QAAQ;IACb,gBAAgB,EAAE,OAAO;IACzB,YAAY,EAAE,OAAO;IACrB,uBAAuB,EAAE,OAAO;
|
|
1
|
+
{"version":3,"file":"allowed-dependencies.js","sourceRoot":"","sources":["../../src/utils/allowed-dependencies.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,8DAA8D;AAC9D,mDAAmD;AAEnD,MAAM,CAAC,MAAM,qBAAqB,GAA2B;IAC3D,2BAA2B,EAAE,GAAG;IAChC,KAAK,EAAE,QAAQ;IACf,WAAW,EAAE,QAAQ;CACtB,CAAA;AAED,MAAM,CAAC,MAAM,qBAAqB,GAA2B;IAC3D,gBAAgB,EAAE,OAAO;IACzB,iBAAiB,EAAE,gBAAgB;IACnC,oBAAoB,EAAE,QAAQ;IAC9B,MAAM,EAAE,OAAO;IACf,eAAe,EAAE,OAAO;IACxB,SAAS,EAAE,OAAO;IAClB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,SAAS;IACjB,cAAc,EAAE,SAAS;IACzB,MAAM,EAAE,SAAS;IACjB,UAAU,EAAE,OAAO;IACnB,cAAc,EAAE,OAAO;IACvB,kBAAkB,EAAE,OAAO;IAC3B,UAAU,EAAE,QAAQ;IACpB,IAAI,EAAE,OAAO;IACb,OAAO,EAAE,OAAO;IAChB,uBAAuB,EAAE,QAAQ;IACjC,EAAE,EAAE,QAAQ;IACZ,gBAAgB,EAAE,QAAQ;IAC1B,eAAe,EAAE,QAAQ;IACzB,kBAAkB,EAAE,QAAQ;IAC5B,4BAA4B,EAAE,OAAO;IACrC,sBAAsB,EAAE,OAAO;IAC/B,yBAAyB,EAAE,OAAO;IAClC,4BAA4B,EAAE,OAAO;IACrC,4BAA4B,EAAE,OAAO;IACrC,4BAA4B,EAAE,OAAO;IACrC,qBAAqB,EAAE,OAAO;IAC9B,eAAe,EAAE,OAAO;IACxB,oBAAoB,EAAE,OAAO;IAC7B,mBAAmB,EAAE,QAAQ;IAC7B,kBAAkB,EAAE,OAAO;IAC3B,mBAAmB,EAAE,OAAO;IAC5B,YAAY,EAAE,OAAO;IACrB,aAAa,EAAE,SAAS;IACxB,GAAG,EAAE,QAAQ;IACb,gBAAgB,EAAE,OAAO;IACzB,YAAY,EAAE,OAAO;IACrB,uBAAuB,EAAE,OAAO;IAChC,yBAAyB,EAAE,QAAQ;IACnC,QAAQ,EAAE,QAAQ;CACnB,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,GAAG,qBAAqB;IACxB,GAAG,qBAAqB;CACzB,CAAA"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Checks if core dependencies (CLI and React) are up to date with latest versions
|
|
3
|
+
* @throws {AbortError} if dependencies are outdated
|
|
4
|
+
*/
|
|
5
|
+
export declare function assertCorePackageVersions(): Promise<void>;
|
|
6
|
+
/**
|
|
7
|
+
* Upgrades core dependencies (CLI and React) to their latest versions
|
|
8
|
+
*/
|
|
9
|
+
export declare function upgradeCorePackages(): Promise<void>;
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
import semver from 'semver';
|
|
2
|
+
import { outputDebug, outputInfo } from '@shopify/cli-kit/node/output';
|
|
3
|
+
import { AbortError } from '@shopify/cli-kit/node/error';
|
|
4
|
+
import { CURRENT_CLI_VERSION } from '../commands/config.js';
|
|
5
|
+
import { getPackageLatestVersion, getPackageVersion, getRunBinCommand, installPackages, } from './package-manager.js';
|
|
6
|
+
/**
|
|
7
|
+
* Checks if core dependencies (CLI and React) are up to date with latest versions
|
|
8
|
+
* @throws {AbortError} if dependencies are outdated
|
|
9
|
+
*/
|
|
10
|
+
export async function assertCorePackageVersions() {
|
|
11
|
+
const upgradeCommand = await getRunBinCommand('shop-minis upgrade');
|
|
12
|
+
// Check CLI version
|
|
13
|
+
const latestCliVersion = await getPackageLatestVersion('@shopify/shop-minis-cli', 'latest');
|
|
14
|
+
const installedCliVersion = CURRENT_CLI_VERSION;
|
|
15
|
+
outputDebug(`Latest CLI version is ${latestCliVersion ?? 'not found'} - Installed CLI version is ${installedCliVersion ?? 'not found'}`);
|
|
16
|
+
assertDependencyVersion({
|
|
17
|
+
dependencyName: '@shopify/shop-minis-cli',
|
|
18
|
+
currentVersion: installedCliVersion,
|
|
19
|
+
expectedVersion: latestCliVersion,
|
|
20
|
+
suggestedSolution: upgradeCommand,
|
|
21
|
+
});
|
|
22
|
+
// Check @shopify/shop-minis-react version
|
|
23
|
+
const latestReactVersion = await getPackageLatestVersion('@shopify/shop-minis-react', 'latest');
|
|
24
|
+
const currentReactVersion = await getPackageVersion('@shopify/shop-minis-react');
|
|
25
|
+
outputDebug(`Latest @shopify/shop-minis-react version is ${latestReactVersion ?? 'not found'} - Installed version is ${currentReactVersion ?? 'not found'}`);
|
|
26
|
+
assertDependencyVersion({
|
|
27
|
+
dependencyName: '@shopify/shop-minis-react',
|
|
28
|
+
currentVersion: currentReactVersion,
|
|
29
|
+
expectedVersion: latestReactVersion,
|
|
30
|
+
suggestedSolution: upgradeCommand,
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Upgrades core dependencies (CLI and React) to their latest versions
|
|
35
|
+
*/
|
|
36
|
+
export async function upgradeCorePackages() {
|
|
37
|
+
const upgradedPackages = [];
|
|
38
|
+
// Step 1: Upgrade CLI to latest version
|
|
39
|
+
const latestCliVersion = await getPackageLatestVersion('@shopify/shop-minis-cli', 'latest');
|
|
40
|
+
if (semver.valid(latestCliVersion) &&
|
|
41
|
+
!semver.gte(CURRENT_CLI_VERSION, latestCliVersion)) {
|
|
42
|
+
outputInfo(`Upgrading @shopify/shop-minis-cli from ${CURRENT_CLI_VERSION} to ${latestCliVersion}...`);
|
|
43
|
+
await installPackages([`@shopify/shop-minis-cli@${latestCliVersion}`], true);
|
|
44
|
+
upgradedPackages.push(`@shopify/shop-minis-cli: ${CURRENT_CLI_VERSION} → ${latestCliVersion}`);
|
|
45
|
+
}
|
|
46
|
+
// Step 2: Upgrade @shopify/shop-minis-react SDK to latest version
|
|
47
|
+
const currentReactVersion = await getPackageVersion('@shopify/shop-minis-react');
|
|
48
|
+
const latestReactVersion = await getPackageLatestVersion('@shopify/shop-minis-react');
|
|
49
|
+
if (semver.valid(latestReactVersion) &&
|
|
50
|
+
!semver.gte(currentReactVersion, latestReactVersion)) {
|
|
51
|
+
outputInfo(`Upgrading @shopify/shop-minis-react from ${currentReactVersion} to ${latestReactVersion}...`);
|
|
52
|
+
await installPackages([`@shopify/shop-minis-react@${latestReactVersion}`], true);
|
|
53
|
+
upgradedPackages.push(`@shopify/shop-minis-react: ${currentReactVersion} → ${latestReactVersion}`);
|
|
54
|
+
}
|
|
55
|
+
// Notify user of successful upgrades
|
|
56
|
+
if (upgradedPackages.length > 0) {
|
|
57
|
+
outputInfo('\n✅ Successfully upgraded core packages:');
|
|
58
|
+
upgradedPackages.forEach(pkg => outputInfo(` • ${pkg}`));
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
outputDebug('All core packages are already up to date');
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
function assertDependencyVersion({ dependencyName, currentVersion, expectedVersion, suggestedSolution, }) {
|
|
65
|
+
try {
|
|
66
|
+
// If we can't determine the expected version, skip the check
|
|
67
|
+
if (!expectedVersion) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
const isUpToDate = semver.gte(currentVersion ?? '0.0.0', expectedVersion);
|
|
71
|
+
if (!isUpToDate) {
|
|
72
|
+
throw new AbortError(`${dependencyName} has to be updated`, `Current version: ${currentVersion} (latest: ${expectedVersion})`, [['Use', { command: suggestedSolution }, 'to update']]);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
catch (error) {
|
|
76
|
+
if (error instanceof AbortError) {
|
|
77
|
+
throw error;
|
|
78
|
+
}
|
|
79
|
+
throw new AbortError(`Unable to detect and compare versions of ${dependencyName}`, `Installed version is ${currentVersion ?? 'not found'}\n` +
|
|
80
|
+
`Latest version is ${expectedVersion ?? 'not found'}\n\n` +
|
|
81
|
+
`Error: ${error instanceof Error ? error.message : String(error)}`);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
//# sourceMappingURL=core-dependencies.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"core-dependencies.js","sourceRoot":"","sources":["../../src/utils/core-dependencies.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare function assertDependencyVersions(): Promise<void>;
|
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
import semver from 'semver';
|
|
2
|
-
import { outputDebug } from '@shopify/cli-kit/node/output';
|
|
3
|
-
import { AbortError } from '@shopify/cli-kit/node/error';
|
|
4
|
-
import { getPackageLatestVersion, getPackageVersion, getRunBinCommand, } from '../../../utils/package-manager.js';
|
|
5
|
-
import { CURRENT_CLI_VERSION } from '../../config.js';
|
|
6
|
-
import { wrapError } from '../errors.js';
|
|
7
|
-
export async function assertDependencyVersions() {
|
|
8
|
-
const upgradeCommand = await getRunBinCommand('shop-minis upgrade');
|
|
9
|
-
// Check CLI version
|
|
10
|
-
const latestCliVersion = await getPackageLatestVersion('@shopify/shop-minis-cli', 'latest');
|
|
11
|
-
const installedCliVersion = CURRENT_CLI_VERSION;
|
|
12
|
-
outputDebug(`Latest CLI version is ${latestCliVersion ?? 'not found'} - Installed CLI version is ${installedCliVersion ?? 'not found'}`);
|
|
13
|
-
assertDependencyVersion({
|
|
14
|
-
dependencyName: '@shopify/shop-minis-cli',
|
|
15
|
-
currentVersion: installedCliVersion,
|
|
16
|
-
expectedVersion: latestCliVersion,
|
|
17
|
-
suggestedSolution: upgradeCommand,
|
|
18
|
-
});
|
|
19
|
-
// Check @shopify/shop-minis-react version
|
|
20
|
-
const latestReactVersion = await getPackageLatestVersion('@shopify/shop-minis-react', 'latest');
|
|
21
|
-
const currentReactVersion = await getPackageVersion('@shopify/shop-minis-react');
|
|
22
|
-
outputDebug(`Latest @shopify/shop-minis-react version is ${latestReactVersion ?? 'not found'} - Installed version is ${currentReactVersion ?? 'not found'}`);
|
|
23
|
-
assertDependencyVersion({
|
|
24
|
-
dependencyName: '@shopify/shop-minis-react',
|
|
25
|
-
currentVersion: currentReactVersion,
|
|
26
|
-
expectedVersion: latestReactVersion,
|
|
27
|
-
suggestedSolution: upgradeCommand,
|
|
28
|
-
});
|
|
29
|
-
}
|
|
30
|
-
function assertDependencyVersion({ dependencyName, currentVersion, expectedVersion, suggestedSolution, }) {
|
|
31
|
-
try {
|
|
32
|
-
// If we can't determine the expected version, skip the check
|
|
33
|
-
if (!expectedVersion) {
|
|
34
|
-
return;
|
|
35
|
-
}
|
|
36
|
-
const isUpToDate = semver.gte(currentVersion ?? '0.0.0', expectedVersion);
|
|
37
|
-
if (!isUpToDate) {
|
|
38
|
-
throw new AbortError(`${dependencyName} has to be updated`, `Current version: ${currentVersion} (latest: ${expectedVersion})`, [['Use', { command: suggestedSolution }, 'to update']]);
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
catch (error) {
|
|
42
|
-
if (error instanceof AbortError) {
|
|
43
|
-
throw error;
|
|
44
|
-
}
|
|
45
|
-
throw wrapError(error, `Unable to detect and compare the current and latest versions of ${dependencyName}\n\n` +
|
|
46
|
-
`Installed version is ${currentVersion ?? 'not found'}\n` +
|
|
47
|
-
`Latest version is ${expectedVersion ?? 'not found'}\n\n`, { separator: '' });
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
//# sourceMappingURL=assert-core-dependencies-version.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"assert-core-dependencies-version.js","sourceRoot":"","sources":["../../../../src/commands/submit/utils/assert-core-dependencies-version.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAA;AACxD,OAAO,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAA;AAEtD,OAAO,EACL,uBAAuB,EACvB,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAC,mBAAmB,EAAC,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAA;AAEtC,MAAM,CAAC,KAAK,UAAU,wBAAwB;IAC5C,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,CAAC,CAAA;IAEnE,oBAAoB;IACpB,MAAM,gBAAgB,GAAG,MAAM,uBAAuB,CACpD,yBAAyB,EACzB,QAAQ,CACT,CAAA;IACD,MAAM,mBAAmB,GAAG,mBAAmB,CAAA;IAE/C,WAAW,CACT,yBACE,gBAAgB,IAAI,WACtB,+BAA+B,mBAAmB,IAAI,WAAW,EAAE,CACpE,CAAA;IAED,uBAAuB,CAAC;QACtB,cAAc,EAAE,yBAAyB;QACzC,cAAc,EAAE,mBAAmB;QACnC,eAAe,EAAE,gBAAgB;QACjC,iBAAiB,EAAE,cAAc;KAClC,CAAC,CAAA;IAEF,0CAA0C;IAC1C,MAAM,kBAAkB,GAAG,MAAM,uBAAuB,CACtD,2BAA2B,EAC3B,QAAQ,CACT,CAAA;IACD,MAAM,mBAAmB,GAAG,MAAM,iBAAiB,CACjD,2BAA2B,CAC5B,CAAA;IAED,WAAW,CACT,+CACE,kBAAkB,IAAI,WACxB,2BAA2B,mBAAmB,IAAI,WAAW,EAAE,CAChE,CAAA;IAED,uBAAuB,CAAC;QACtB,cAAc,EAAE,2BAA2B;QAC3C,cAAc,EAAE,mBAAmB;QACnC,eAAe,EAAE,kBAAkB;QACnC,iBAAiB,EAAE,cAAc;KAClC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,uBAAuB,CAAC,EAC/B,cAAc,EACd,cAAc,EACd,eAAe,EACf,iBAAiB,GAMlB;IACC,IAAI;QACF,6DAA6D;QAC7D,IAAI,CAAC,eAAe,EAAE;YACpB,OAAM;SACP;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,EAAE,eAAe,CAAC,CAAA;QACzE,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,UAAU,CAClB,GAAG,cAAc,oBAAoB,EACrC,oBAAoB,cAAc,aAAa,eAAe,GAAG,EACjE,CAAC,CAAC,KAAK,EAAE,EAAC,OAAO,EAAE,iBAAiB,EAAC,EAAE,WAAW,CAAC,CAAC,CACrD,CAAA;SACF;KACF;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,KAAK,YAAY,UAAU,EAAE;YAC/B,MAAM,KAAK,CAAA;SACZ;QAED,MAAM,SAAS,CACb,KAAK,EACL,mEAAmE,cAAc,MAAM;YACrF,wBAAwB,cAAc,IAAI,WAAW,IAAI;YACzD,qBAAqB,eAAe,IAAI,WAAW,MAAM,EAC3D,EAAC,SAAS,EAAE,EAAE,EAAC,CAChB,CAAA;KACF;AACH,CAAC"}
|