@shopify/create-app 3.34.0 → 3.36.0

package/dist/utils/template/cleanup.js

@@ -1,18 +1,19 @@
-import { file, path } from '@shopify/cli-kit';
+import { rmdir, glob } from '@shopify/cli-kit/node/fs';
+import { joinPath } from '@shopify/cli-kit/node/path';
 export default async function cleanup(webOutputDirectory) {
-    const gitPaths = await path.glob([
-        path.join(webOutputDirectory, '**', '.git'),
-        path.join(webOutputDirectory, '**', '.github'),
-        path.join(webOutputDirectory, '**', '.gitmodules'),
-        path.join(webOutputDirectory, 'LICENSE*'),
-        path.join(webOutputDirectory, '**', 'frontend/LICENSE*'),
-        path.join(webOutputDirectory, 'package.json.cli2'),
+    const gitPaths = await glob([
+        joinPath(webOutputDirectory, '**', '.git'),
+        joinPath(webOutputDirectory, '**', '.github'),
+        joinPath(webOutputDirectory, '**', '.gitmodules'),
+        joinPath(webOutputDirectory, 'LICENSE*'),
+        joinPath(webOutputDirectory, '**', 'frontend/LICENSE*'),
+        joinPath(webOutputDirectory, 'package.json.cli2'),
     ], {
         dot: true,
         onlyFiles: false,
         onlyDirectories: false,
         ignore: ['**/node_modules/**'],
     });
-    return Promise.all(gitPaths.map((path) => file.rmdir(path, { force: true }))).then(() => { });
+    return Promise.all(gitPaths.map((path) => rmdir(path, { force: true }))).then(() => { });
 }
 //# sourceMappingURL=cleanup.js.map

package/dist/utils/template/cleanup.js.map

@@ -1 +1 @@
-{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../src/utils/template/cleanup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAE3C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,OAAO,CAAC,kBAA0B;IAC9D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAC9B;QACE,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,EAAE,MAAM,CAAC;QAC3C,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,EAAE,SAAS,CAAC;QAC9C,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,EAAE,aAAa,CAAC;QAClD,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,UAAU,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,EAAE,mBAAmB,CAAC;QACxD,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;KACnD,EACD;QACE,GAAG,EAAE,IAAI;QACT,SAAS,EAAE,KAAK;QAChB,eAAe,EAAE,KAAK;QACtB,MAAM,EAAE,CAAC,oBAAoB,CAAC;KAC/B,CACF,CAAA;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;AAC5F,CAAC","sourcesContent":["import {file, path} from '@shopify/cli-kit'\n\nexport default async function cleanup(webOutputDirectory: string) {\n  const gitPaths = await path.glob(\n    [\n      path.join(webOutputDirectory, '**', '.git'),\n      path.join(webOutputDirectory, '**', '.github'),\n      path.join(webOutputDirectory, '**', '.gitmodules'),\n      path.join(webOutputDirectory, 'LICENSE*'),\n      path.join(webOutputDirectory, '**', 'frontend/LICENSE*'),\n      path.join(webOutputDirectory, 'package.json.cli2'),\n    ],\n    {\n      dot: true,\n      onlyFiles: false,\n      onlyDirectories: false,\n      ignore: ['**/node_modules/**'],\n    },\n  )\n\n  return Promise.all(gitPaths.map((path) => file.rmdir(path, {force: true}))).then(() => {})\n}\n"]}
+{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../src/utils/template/cleanup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,IAAI,EAAC,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAC,QAAQ,EAAC,MAAM,4BAA4B,CAAA;AAEnD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,OAAO,CAAC,kBAA0B;IAC9D,MAAM,QAAQ,GAAG,MAAM,IAAI,CACzB;QACE,QAAQ,CAAC,kBAAkB,EAAE,IAAI,EAAE,MAAM,CAAC;QAC1C,QAAQ,CAAC,kBAAkB,EAAE,IAAI,EAAE,SAAS,CAAC;QAC7C,QAAQ,CAAC,kBAAkB,EAAE,IAAI,EAAE,aAAa,CAAC;QACjD,QAAQ,CAAC,kBAAkB,EAAE,UAAU,CAAC;QACxC,QAAQ,CAAC,kBAAkB,EAAE,IAAI,EAAE,mBAAmB,CAAC;QACvD,QAAQ,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;KAClD,EACD;QACE,GAAG,EAAE,IAAI;QACT,SAAS,EAAE,KAAK;QAChB,eAAe,EAAE,KAAK;QACtB,MAAM,EAAE,CAAC,oBAAoB,CAAC;KAC/B,CACF,CAAA;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;AACvF,CAAC","sourcesContent":["import {rmdir, glob} from '@shopify/cli-kit/node/fs'\nimport {joinPath} from '@shopify/cli-kit/node/path'\n\nexport default async function cleanup(webOutputDirectory: string) {\n  const gitPaths = await glob(\n    [\n      joinPath(webOutputDirectory, '**', '.git'),\n      joinPath(webOutputDirectory, '**', '.github'),\n      joinPath(webOutputDirectory, '**', '.gitmodules'),\n      joinPath(webOutputDirectory, 'LICENSE*'),\n      joinPath(webOutputDirectory, '**', 'frontend/LICENSE*'),\n      joinPath(webOutputDirectory, 'package.json.cli2'),\n    ],\n    {\n      dot: true,\n      onlyFiles: false,\n      onlyDirectories: false,\n      ignore: ['**/node_modules/**'],\n    },\n  )\n\n  return Promise.all(gitPaths.map((path) => rmdir(path, {force: true}))).then(() => {})\n}\n"]}

package/dist/utils/template/npm.d.ts

@@ -1,14 +1,13 @@
-import { ui, npm } from '@shopify/cli-kit';
-import { PackageManager } from '@shopify/cli-kit/node/node-package-manager';
+import { PackageManager, PackageJson } from '@shopify/cli-kit/node/node-package-manager';
+import { Task } from '@shopify/cli-kit/src/private/node/ui/components/Tasks.js';
 interface UpdateCLIDependenciesOptions {
     directory: string;
-    packageJSON: npm.PackageJSON;
+    packageJSON: PackageJson;
     local: boolean;
 }
-export declare function updateCLIDependencies({ packageJSON, local, }: UpdateCLIDependenciesOptions): Promise<npm.PackageJSON>;
-export declare function getDeepInstallNPMTasks({ from, packageManager, didInstallEverything, }: {
+export declare function updateCLIDependencies({ packageJSON, local }: UpdateCLIDependenciesOptions): Promise<PackageJson>;
+export declare function getDeepInstallNPMTasks({ from, packageManager, }: {
     from: string;
     packageManager: PackageManager;
-    didInstallEverything(): void;
-}): Promise<ui.ListrTask[]>;
+}): Promise<Task[]>;
 export {};

package/dist/utils/template/npm.js

@@ -1,13 +1,12 @@
-import { path, constants } from '@shopify/cli-kit';
 import { installNodeModules } from '@shopify/cli-kit/node/node-package-manager';
-import { Writable } from 'stream';
+import { CLI_KIT_VERSION } from '@shopify/cli-kit/common/version';
+import { joinPath, moduleDirectory, normalizePath } from '@shopify/cli-kit/node/path';
+import { glob, findPathUp } from '@shopify/cli-kit/node/fs';
 import { platform } from 'os';
-export async function updateCLIDependencies({ packageJSON, local, }) {
-    const cliKitVersion = await constants.versions.cliKit();
-    const moduleDirectory = path.moduleDirectory(import.meta.url);
+export async function updateCLIDependencies({ packageJSON, local }) {
     packageJSON.dependencies = packageJSON.dependencies || {};
-    packageJSON.dependencies['@shopify/cli'] = cliKitVersion;
-    packageJSON.dependencies['@shopify/app'] = cliKitVersion;
+    packageJSON.dependencies['@shopify/cli'] = CLI_KIT_VERSION;
+    packageJSON.dependencies['@shopify/app'] = CLI_KIT_VERSION;
     if (local) {
         const cliPath = await packagePath('cli');
         const appPath = await packagePath('app');
@@ -33,44 +32,32 @@ export async function updateCLIDependencies({ packageJSON, local, }) {
     return packageJSON;
 }
 async function packagePath(packageName) {
-    const packageAbsolutePath = (await path.findUp(`packages/${packageName}`, {
+    const packageAbsolutePath = (await findPathUp(`packages/${packageName}`, {
         type: 'directory',
-        cwd: path.moduleDirectory(import.meta.url),
+        cwd: moduleDirectory(import.meta.url),
     }));
     return `file:${packageAbsolutePath}`;
 }
-export async function getDeepInstallNPMTasks({ from, packageManager, didInstallEverything, }) {
-    const root = path.normalize(from);
-    const packageJSONFiles = await path.glob([path.join(root, '**/package.json')]);
-    let foldersInstalled = 0;
+export async function getDeepInstallNPMTasks({ from, packageManager, }) {
+    const root = normalizePath(from);
+    const packageJSONFiles = await glob([joinPath(root, '**/package.json')]);
     return packageJSONFiles.map((filePath) => {
         const folderPath = filePath.replace('package.json', '');
         const titlePath = folderPath.replace(root, '');
+        /**
+         * Installation of dependencies using Yarn on Windows might lead
+         * to "EPERM: operation not permitted, unlink" errors when Yarn tries
+         * to access the cache. By limiting the network concurrency we mitigate the
+         * error:
+         *
+         * Failing scenario: https://github.com/Shopify/cli/runs/7913938724
+         * Reported issue: https://github.com/yarnpkg/yarn/issues/7212
+         */
+        const args = platform() === 'win32' && packageManager === 'yarn' ? ['--network-concurrency', '1'] : [];
         return {
             title: `Installing dependencies in ${titlePath}`,
-            task: async (_, task) => {
-                const output = new Writable({
-                    write(chunk, _, next) {
-                        task.output = chunk.toString();
-                        next();
-                    },
-                });
-                /**
-                 * Installation of dependencies using Yarn on Windows might lead
-                 * to "EPERM: operation not permitted, unlink" errors when Yarn tries
-                 * to access the cache. By limiting the network concurrency we mitigate the
-                 * error:
-                 *
-                 * Failing scenario: https://github.com/Shopify/cli/runs/7913938724
-                 * Reported issue: https://github.com/yarnpkg/yarn/issues/7212
-                 */
-                const args = platform() === 'win32' && packageManager === 'yarn' ? ['--network-concurrency', '1'] : [];
-                await installNodeModules({ directory: folderPath, packageManager, stdout: output, stderr: output, args });
-                task.title = `Installed dependencies in ${titlePath}`;
-                foldersInstalled++;
-                if (foldersInstalled === packageJSONFiles.length) {
-                    didInstallEverything();
-                }
+            task: async () => {
+                await installNodeModules({ directory: folderPath, packageManager, args });
             },
         };
     });

package/dist/utils/template/npm.js.map

@@ -1 +1 @@
-{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../src/utils/template/npm.ts"],"names":[],"mappings":"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","sourcesContent":["import {path, ui, npm, constants} from '@shopify/cli-kit'\nimport {PackageManager, installNodeModules} from '@shopify/cli-kit/node/node-package-manager'\nimport {Writable} from 'stream'\nimport {platform} from 'os'\n\ninterface UpdateCLIDependenciesOptions {\n  directory: string\n  packageJSON: npm.PackageJSON\n  local: boolean\n}\n\nexport async function updateCLIDependencies({\n  packageJSON,\n  local,\n}: UpdateCLIDependenciesOptions): Promise<npm.PackageJSON> {\n  const cliKitVersion = await constants.versions.cliKit()\n  const moduleDirectory = path.moduleDirectory(import.meta.url)\n\n  packageJSON.dependencies = packageJSON.dependencies || {}\n  packageJSON.dependencies['@shopify/cli'] = cliKitVersion\n  packageJSON.dependencies['@shopify/app'] = cliKitVersion\n\n  if (local) {\n    const cliPath = await packagePath('cli')\n    const appPath = await packagePath('app')\n    const cliKitPath = await packagePath('cli-kit')\n    const pluginNgrokPath = await packagePath('plugin-ngrok')\n\n    // eslint-disable-next-line require-atomic-updates\n    packageJSON.dependencies['@shopify/cli'] = cliPath\n    // eslint-disable-next-line require-atomic-updates\n    packageJSON.dependencies['@shopify/app'] = appPath\n\n    const dependencyOverrides = {\n      '@shopify/cli': cliPath,\n      '@shopify/app': appPath,\n      '@shopify/cli-kit': cliKitPath,\n      '@shopify/plugin-ngrok': pluginNgrokPath,\n    }\n\n    packageJSON.overrides = packageJSON.overrides\n      ? {...packageJSON.overrides, ...dependencyOverrides}\n      : dependencyOverrides\n\n    packageJSON.resolutions = packageJSON.resolutions\n      ? {...packageJSON.resolutions, ...dependencyOverrides}\n      : dependencyOverrides\n  }\n\n  return packageJSON\n}\n\nasync function packagePath(packageName: string): Promise<string> {\n  const packageAbsolutePath = (await path.findUp(`packages/${packageName}`, {\n    type: 'directory',\n    cwd: path.moduleDirectory(import.meta.url),\n  })) as string\n  return `file:${packageAbsolutePath}`\n}\n\nexport async function getDeepInstallNPMTasks({\n  from,\n  packageManager,\n  didInstallEverything,\n}: {\n  from: string\n  packageManager: PackageManager\n  didInstallEverything(): void\n}): Promise<ui.ListrTask[]> {\n  const root = path.normalize(from)\n  const packageJSONFiles = await path.glob([path.join(root, '**/package.json')])\n  let foldersInstalled = 0\n\n  return packageJSONFiles.map((filePath) => {\n    const folderPath = filePath.replace('package.json', '')\n    const titlePath = folderPath.replace(root, '')\n\n    return {\n      title: `Installing dependencies in ${titlePath}`,\n      task: async (_, task) => {\n        const output = new Writable({\n          write(chunk, _, next) {\n            task.output = chunk.toString()\n            next()\n          },\n        })\n        /**\n         * Installation of dependencies using Yarn on Windows might lead\n         * to \"EPERM: operation not permitted, unlink\" errors when Yarn tries\n         * to access the cache. By limiting the network concurrency we mitigate the\n         * error:\n         *\n         * Failing scenario: https://github.com/Shopify/cli/runs/7913938724\n         * Reported issue: https://github.com/yarnpkg/yarn/issues/7212\n         */\n        const args = platform() === 'win32' && packageManager === 'yarn' ? ['--network-concurrency', '1'] : []\n        await installNodeModules({directory: folderPath, packageManager, stdout: output, stderr: output, args})\n\n        task.title = `Installed dependencies in ${titlePath}`\n\n        foldersInstalled++\n\n        if (foldersInstalled === packageJSONFiles.length) {\n          didInstallEverything()\n        }\n      },\n    }\n  })\n}\n"]}
+{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../src/utils/template/npm.ts"],"names":[],"mappings":"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","sourcesContent":["import {PackageManager, installNodeModules, PackageJson} from '@shopify/cli-kit/node/node-package-manager'\nimport {CLI_KIT_VERSION} from '@shopify/cli-kit/common/version'\nimport {Task} from '@shopify/cli-kit/src/private/node/ui/components/Tasks.js'\nimport {joinPath, moduleDirectory, normalizePath} from '@shopify/cli-kit/node/path'\nimport {glob, findPathUp} from '@shopify/cli-kit/node/fs'\nimport {platform} from 'os'\n\ninterface UpdateCLIDependenciesOptions {\n  directory: string\n  packageJSON: PackageJson\n  local: boolean\n}\n\nexport async function updateCLIDependencies({packageJSON, local}: UpdateCLIDependenciesOptions): Promise<PackageJson> {\n  packageJSON.dependencies = packageJSON.dependencies || {}\n  packageJSON.dependencies['@shopify/cli'] = CLI_KIT_VERSION\n  packageJSON.dependencies['@shopify/app'] = CLI_KIT_VERSION\n\n  if (local) {\n    const cliPath = await packagePath('cli')\n    const appPath = await packagePath('app')\n    const cliKitPath = await packagePath('cli-kit')\n    const pluginNgrokPath = await packagePath('plugin-ngrok')\n\n    // eslint-disable-next-line require-atomic-updates\n    packageJSON.dependencies['@shopify/cli'] = cliPath\n    // eslint-disable-next-line require-atomic-updates\n    packageJSON.dependencies['@shopify/app'] = appPath\n\n    const dependencyOverrides = {\n      '@shopify/cli': cliPath,\n      '@shopify/app': appPath,\n      '@shopify/cli-kit': cliKitPath,\n      '@shopify/plugin-ngrok': pluginNgrokPath,\n    }\n\n    packageJSON.overrides = packageJSON.overrides\n      ? {...packageJSON.overrides, ...dependencyOverrides}\n      : dependencyOverrides\n\n    packageJSON.resolutions = packageJSON.resolutions\n      ? {...packageJSON.resolutions, ...dependencyOverrides}\n      : dependencyOverrides\n  }\n\n  return packageJSON\n}\n\nasync function packagePath(packageName: string): Promise<string> {\n  const packageAbsolutePath = (await findPathUp(`packages/${packageName}`, {\n    type: 'directory',\n    cwd: moduleDirectory(import.meta.url),\n  })) as string\n  return `file:${packageAbsolutePath}`\n}\n\nexport async function getDeepInstallNPMTasks({\n  from,\n  packageManager,\n}: {\n  from: string\n  packageManager: PackageManager\n}): Promise<Task[]> {\n  const root = normalizePath(from)\n  const packageJSONFiles = await glob([joinPath(root, '**/package.json')])\n\n  return packageJSONFiles.map((filePath) => {\n    const folderPath = filePath.replace('package.json', '')\n    const titlePath = folderPath.replace(root, '')\n\n    /**\n     * Installation of dependencies using Yarn on Windows might lead\n     * to \"EPERM: operation not permitted, unlink\" errors when Yarn tries\n     * to access the cache. By limiting the network concurrency we mitigate the\n     * error:\n     *\n     * Failing scenario: https://github.com/Shopify/cli/runs/7913938724\n     * Reported issue: https://github.com/yarnpkg/yarn/issues/7212\n     */\n    const args = platform() === 'win32' && packageManager === 'yarn' ? ['--network-concurrency', '1'] : []\n    return {\n      title: `Installing dependencies in ${titlePath}`,\n      task: async () => {\n        await installNodeModules({directory: folderPath, packageManager, args})\n      },\n    }\n  })\n}\n"]}

package/dist/utils/versions.js

@@ -1,19 +1,21 @@
-import { file, path, error } from '@shopify/cli-kit';
+import { error } from '@shopify/cli-kit';
+import { readFile, findPathUp } from '@shopify/cli-kit/node/fs';
+import { dirname } from '@shopify/cli-kit/node/path';
 import { fileURLToPath } from 'url';
 export async function cliVersion() {
-    const cliPackageJsonpath = (await path.findUp('@shopify/cli/package.json', {
-        cwd: path.dirname(fileURLToPath(import.meta.url)),
+    const cliPackageJsonpath = (await findPathUp('@shopify/cli/package.json', {
+        cwd: dirname(fileURLToPath(import.meta.url)),
         type: 'file',
         allowSymlinks: true,
     })) ??
-        (await path.findUp('packages/cli/package.json', {
-            cwd: path.dirname(fileURLToPath(import.meta.url)),
+        (await findPathUp('packages/cli/package.json', {
+            cwd: dirname(fileURLToPath(import.meta.url)),
             type: 'file',
         }));
     if (!cliPackageJsonpath) {
         throw new error.Bug("Couldn't determine the version of the CLI");
     }
-    const packageJson = JSON.parse(await file.read(cliPackageJsonpath));
+    const packageJson = JSON.parse(await readFile(cliPackageJsonpath));
     return packageJson.version;
 }
 //# sourceMappingURL=versions.js.map

package/dist/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../src/utils/versions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAC,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAA;AAEjC,MAAM,CAAC,KAAK,UAAU,UAAU;IAC9B,MAAM,kBAAkB,GACtB,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,2BAA2B,EAAE;QAC9C,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,EAAE,MAAM;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC,CAAC;QACH,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,2BAA2B,EAAE;YAC9C,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACjD,IAAI,EAAE,MAAM;SACb,CAAC,CAAC,CAAA;IACL,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAA;KACjE;IACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAA;IACnE,OAAO,WAAW,CAAC,OAAO,CAAA;AAC5B,CAAC","sourcesContent":["import {file, path, error} from '@shopify/cli-kit'\nimport {fileURLToPath} from 'url'\n\nexport async function cliVersion(): Promise<string> {\n  const cliPackageJsonpath =\n    (await path.findUp('@shopify/cli/package.json', {\n      cwd: path.dirname(fileURLToPath(import.meta.url)),\n      type: 'file',\n      allowSymlinks: true,\n    })) ??\n    (await path.findUp('packages/cli/package.json', {\n      cwd: path.dirname(fileURLToPath(import.meta.url)),\n      type: 'file',\n    }))\n  if (!cliPackageJsonpath) {\n    throw new error.Bug(\"Couldn't determine the version of the CLI\")\n  }\n  const packageJson = JSON.parse(await file.read(cliPackageJsonpath))\n  return packageJson.version\n}\n"]}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../src/utils/versions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,kBAAkB,CAAA;AACtC,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAC,OAAO,EAAC,MAAM,4BAA4B,CAAA;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAA;AAEjC,MAAM,CAAC,KAAK,UAAU,UAAU;IAC9B,MAAM,kBAAkB,GACtB,CAAC,MAAM,UAAU,CAAC,2BAA2B,EAAE;QAC7C,GAAG,EAAE,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,EAAE,MAAM;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC,CAAC;QACH,CAAC,MAAM,UAAU,CAAC,2BAA2B,EAAE;YAC7C,GAAG,EAAE,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC5C,IAAI,EAAE,MAAM;SACb,CAAC,CAAC,CAAA;IACL,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAA;KACjE;IACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAA;IAClE,OAAO,WAAW,CAAC,OAAO,CAAA;AAC5B,CAAC","sourcesContent":["import {error} from '@shopify/cli-kit'\nimport {readFile, findPathUp} from '@shopify/cli-kit/node/fs'\nimport {dirname} from '@shopify/cli-kit/node/path'\nimport {fileURLToPath} from 'url'\n\nexport async function cliVersion(): Promise<string> {\n  const cliPackageJsonpath =\n    (await findPathUp('@shopify/cli/package.json', {\n      cwd: dirname(fileURLToPath(import.meta.url)),\n      type: 'file',\n      allowSymlinks: true,\n    })) ??\n    (await findPathUp('packages/cli/package.json', {\n      cwd: dirname(fileURLToPath(import.meta.url)),\n      type: 'file',\n    }))\n  if (!cliPackageJsonpath) {\n    throw new error.Bug(\"Couldn't determine the version of the CLI\")\n  }\n  const packageJson = JSON.parse(await readFile(cliPackageJsonpath))\n  return packageJson.version\n}\n"]}

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"3.34.0","commands":{"init":{"id":"init","strict":true,"pluginName":"@shopify/create-app","pluginAlias":"@shopify/create-app","pluginType":"core","aliases":["create-app"],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"name":{"name":"name","type":"option","char":"n","hidden":false,"multiple":false},"path":{"name":"path","type":"option","char":"p","hidden":false,"multiple":false},"template":{"name":"template","type":"option","description":"The app template. Accepts one of the following:\n       - <node|php|ruby>\n       - Any GitHub repo with optional branch and subpath, e.g., https://github.com/Shopify/<repository>/[subpath]#[branch]","multiple":false},"package-manager":{"name":"package-manager","type":"option","char":"d","hidden":false,"multiple":false,"options":["npm","yarn","pnpm"]},"local":{"name":"local","type":"boolean","char":"l","hidden":true,"allowNo":false}},"args":[]}}}
+{"version":"3.36.0","commands":{"init":{"id":"init","strict":true,"pluginName":"@shopify/create-app","pluginAlias":"@shopify/create-app","pluginType":"core","aliases":["create-app"],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"name":{"name":"name","type":"option","char":"n","hidden":false,"multiple":false},"path":{"name":"path","type":"option","char":"p","hidden":false,"multiple":false},"template":{"name":"template","type":"option","description":"The app template. Accepts one of the following:\n       - <node|php|ruby>\n       - Any GitHub repo with optional branch and subpath, e.g., https://github.com/Shopify/<repository>/[subpath]#[branch]","multiple":false},"package-manager":{"name":"package-manager","type":"option","char":"d","hidden":false,"multiple":false,"options":["npm","yarn","pnpm"]},"local":{"name":"local","type":"boolean","char":"l","hidden":true,"allowNo":false}},"args":[]}}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/create-app",
-  "version": "3.34.0",
+  "version": "3.36.0",
   "private": false,
   "description": "A CLI tool to create a new Shopify app.",
   "keywords": [
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@oclif/core": "1.21.0",
-    "@shopify/cli-kit": "3.34.0"
+    "@shopify/cli-kit": "3.36.0"
   },
   "devDependencies": {
     "@types/node": "14.17.0",