@shopify/create-app 3.58.2 → 3.59.0

package/dist/utils/template/cleanup.js

@@ -1,19 +1,18 @@
-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 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) => rmdir(path, { force: true }))).then(() => { });
-}
-//# sourceMappingURL=cleanup.js.map
+import {
+  cleanup
+} from "../../chunk-CKY5L2DS.js";
+import "../../chunk-WLJ2CNLG.js";
+import "../../chunk-FBB6KUZG.js";
+import "../../chunk-YLEF4RUH.js";
+import "../../chunk-G6FN5VUE.js";
+import "../../chunk-UVY6LL5H.js";
+import "../../chunk-7XQTD3L4.js";
+import "../../chunk-P4TVG45N.js";
+import "../../chunk-ZPB26OWQ.js";
+import "../../chunk-WCNR75S2.js";
+import "../../chunk-3JLUTHGR.js";
+import "../../chunk-GXPKATXW.js";
+import "../../chunk-M63RTPGR.js";
+export {
+  cleanup as default
+};

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

@@ -0,0 +1,74 @@
+import {
+  cleanup
+} from "../../chunk-CKY5L2DS.js";
+import {
+  fileExists,
+  inTemporaryDirectory,
+  mkdir,
+  writeFile
+} from "../../chunk-WLJ2CNLG.js";
+import "../../chunk-FBB6KUZG.js";
+import "../../chunk-YLEF4RUH.js";
+import {
+  joinPath
+} from "../../chunk-G6FN5VUE.js";
+import "../../chunk-UVY6LL5H.js";
+import "../../chunk-7XQTD3L4.js";
+import "../../chunk-P4TVG45N.js";
+import "../../chunk-ZPB26OWQ.js";
+import "../../chunk-WCNR75S2.js";
+import {
+  describe,
+  globalExpect,
+  test
+} from "../../chunk-3JNB3A7C.js";
+import "../../chunk-3JLUTHGR.js";
+import "../../chunk-GXPKATXW.js";
+import {
+  init_cjs_shims
+} from "../../chunk-M63RTPGR.js";
+
+// src/utils/template/cleanup.test.ts
+init_cjs_shims();
+describe("cleanup", () => {
+  async function mockProjectFolder(tmpDir) {
+    await Promise.all([
+      // should keep these
+      writeFile(joinPath(tmpDir, "server.js"), "console.log()"),
+      mkdir(joinPath(tmpDir, "node_modules")),
+      // should delete these
+      mkdir(joinPath(tmpDir, ".git")),
+      mkdir(joinPath(tmpDir, ".github")),
+      mkdir(joinPath(tmpDir, ".gitmodules")),
+      mkdir(joinPath(tmpDir, "frontend")),
+      mkdir(joinPath(tmpDir, "package.json.cli2"))
+    ]);
+    await Promise.all([
+      // should keep these
+      writeFile(joinPath(tmpDir, "frontend", "server.js"), "console.log()"),
+      // should delete these
+      mkdir(joinPath(tmpDir, "frontend", ".git")),
+      mkdir(joinPath(tmpDir, "frontend", "node_modules"))
+    ]);
+  }
+  test("cleans up template files in web directory", async () => {
+    await inTemporaryDirectory(async (tmpDir) => {
+      await mockProjectFolder(tmpDir);
+      await cleanup(tmpDir);
+      await globalExpect(fileExists(joinPath(tmpDir, ".git"))).resolves.toBe(false);
+      await globalExpect(fileExists(joinPath(tmpDir, ".github"))).resolves.toBe(false);
+      await globalExpect(fileExists(joinPath(tmpDir, ".gitmodules"))).resolves.toBe(false);
+      await globalExpect(fileExists(joinPath(tmpDir, "frontend", ".git"))).resolves.toBe(false);
+      await globalExpect(fileExists(joinPath(tmpDir, "package.json.cli2"))).resolves.toBe(false);
+    });
+  });
+  test("keeps non-template files", async () => {
+    await inTemporaryDirectory(async (tmpDir) => {
+      await mockProjectFolder(tmpDir);
+      await cleanup(tmpDir);
+      await globalExpect(fileExists(joinPath(tmpDir, "server.js"))).resolves.toBe(true);
+      await globalExpect(fileExists(joinPath(tmpDir, "node_modules"))).resolves.toBe(true);
+      await globalExpect(fileExists(joinPath(tmpDir, "frontend", "node_modules"))).resolves.toBe(true);
+    });
+  });
+});

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

@@ -3,8 +3,9 @@ interface UpdateCLIDependenciesOptions {
     directory: string;
     packageJSON: PackageJson;
     local: boolean;
+    useGlobalCLI: boolean;
 }
-export declare function updateCLIDependencies({ packageJSON, local }: UpdateCLIDependenciesOptions): Promise<PackageJson>;
+export declare function updateCLIDependencies({ packageJSON, local, useGlobalCLI, }: UpdateCLIDependenciesOptions): Promise<PackageJson>;
 export declare function getDeepInstallNPMTasks({ from, packageManager, }: {
     from: string;
     packageManager: PackageManager;

package/dist/utils/template/npm.js

@@ -1,58 +1,22 @@
-import { installNodeModules } from '@shopify/cli-kit/node/node-package-manager';
-import { CLI_KIT_VERSION } from '@shopify/cli-kit/common/version';
-import { moduleDirectory, normalizePath } from '@shopify/cli-kit/node/path';
-import { findPathUp } from '@shopify/cli-kit/node/fs';
-import { platform } from 'os';
-export async function updateCLIDependencies({ packageJSON, local }) {
-    packageJSON.dependencies = packageJSON.dependencies || {};
-    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');
-        const createAppPath = await packagePath('create-app');
-        const cliKitPath = await packagePath('cli-kit');
-        const pluginCloudflarePath = await packagePath('plugin-cloudflare');
-        const didYouMeanPath = await packagePath('plugin-did-you-mean');
-        // eslint-disable-next-line require-atomic-updates
-        packageJSON.dependencies['@shopify/cli'] = cliPath;
-        // eslint-disable-next-line require-atomic-updates
-        packageJSON.dependencies['@shopify/app'] = appPath;
-        const dependencyOverrides = {
-            '@shopify/cli': cliPath,
-            '@shopify/app': appPath,
-            '@shopify/create-app': createAppPath,
-            '@shopify/cli-kit': cliKitPath,
-            '@shopify/plugin-did-you-mean': didYouMeanPath,
-            '@shopify/plugin-cloudflare': pluginCloudflarePath,
-        };
-        packageJSON.overrides = packageJSON.overrides
-            ? { ...packageJSON.overrides, ...dependencyOverrides }
-            : dependencyOverrides;
-        packageJSON.resolutions = packageJSON.resolutions
-            ? { ...packageJSON.resolutions, ...dependencyOverrides }
-            : dependencyOverrides;
-    }
-    return packageJSON;
-}
-async function packagePath(packageName) {
-    const packageAbsolutePath = (await findPathUp(`packages/${packageName}`, {
-        type: 'directory',
-        cwd: moduleDirectory(import.meta.url),
-    }));
-    return `file:${packageAbsolutePath}`;
-}
-export async function getDeepInstallNPMTasks({ from, packageManager, }) {
-    /**
-     * 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 installNodeModules({ directory: normalizePath(from), packageManager, args });
-}
-//# sourceMappingURL=npm.js.map
+import {
+  getDeepInstallNPMTasks,
+  updateCLIDependencies
+} from "../../chunk-4SXWHRL5.js";
+import "../../chunk-H7CRO63U.js";
+import "../../chunk-ZDCQCTOO.js";
+import "../../chunk-WLJ2CNLG.js";
+import "../../chunk-FBB6KUZG.js";
+import "../../chunk-YLEF4RUH.js";
+import "../../chunk-G6FN5VUE.js";
+import "../../chunk-UVY6LL5H.js";
+import "../../chunk-7XQTD3L4.js";
+import "../../chunk-P4TVG45N.js";
+import "../../chunk-ZPB26OWQ.js";
+import "../../chunk-WCNR75S2.js";
+import "../../chunk-3JLUTHGR.js";
+import "../../chunk-GXPKATXW.js";
+import "../../chunk-M63RTPGR.js";
+export {
+  getDeepInstallNPMTasks,
+  updateCLIDependencies
+};

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

@@ -1 +1 @@
-{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../src/utils/template/npm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,kBAAkB,EAAc,MAAM,4CAA4C,CAAA;AAC1G,OAAO,EAAC,eAAe,EAAC,MAAM,iCAAiC,CAAA;AAC/D,OAAO,EAAC,eAAe,EAAE,aAAa,EAAC,MAAM,4BAA4B,CAAA;AACzE,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAC,QAAQ,EAAC,MAAM,IAAI,CAAA;AAQ3B,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,EAAC,WAAW,EAAE,KAAK,EAA+B;IAC5F,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,IAAI,EAAE,CAAA;IACzD,WAAW,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,eAAe,CAAA;IAC1D,WAAW,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,eAAe,CAAA;IAE1D,IAAI,KAAK,EAAE;QACT,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,CAAA;QACxC,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,CAAA;QACxC,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,CAAA;QACrD,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,CAAA;QAC/C,MAAM,oBAAoB,GAAG,MAAM,WAAW,CAAC,mBAAmB,CAAC,CAAA;QACnE,MAAM,cAAc,GAAG,MAAM,WAAW,CAAC,qBAAqB,CAAC,CAAA;QAE/D,kDAAkD;QAClD,WAAW,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,OAAO,CAAA;QAClD,kDAAkD;QAClD,WAAW,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,OAAO,CAAA;QAElD,MAAM,mBAAmB,GAAG;YAC1B,cAAc,EAAE,OAAO;YACvB,cAAc,EAAE,OAAO;YACvB,qBAAqB,EAAE,aAAa;YACpC,kBAAkB,EAAE,UAAU;YAC9B,8BAA8B,EAAE,cAAc;YAC9C,4BAA4B,EAAE,oBAAoB;SACnD,CAAA;QAED,WAAW,CAAC,SAAS,GAAG,WAAW,CAAC,SAAS;YAC3C,CAAC,CAAC,EAAC,GAAG,WAAW,CAAC,SAAS,EAAE,GAAG,mBAAmB,EAAC;YACpD,CAAC,CAAC,mBAAmB,CAAA;QAEvB,WAAW,CAAC,WAAW,GAAG,WAAW,CAAC,WAAW;YAC/C,CAAC,CAAC,EAAC,GAAG,WAAW,CAAC,WAAW,EAAE,GAAG,mBAAmB,EAAC;YACtD,CAAC,CAAC,mBAAmB,CAAA;KACxB;IAED,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,WAAmB;IAC5C,MAAM,mBAAmB,GAAG,CAAC,MAAM,UAAU,CAAC,YAAY,WAAW,EAAE,EAAE;QACvE,IAAI,EAAE,WAAW;QACjB,GAAG,EAAE,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;KACtC,CAAC,CAAW,CAAA;IACb,OAAO,QAAQ,mBAAmB,EAAE,CAAA;AACtC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EAC3C,IAAI,EACJ,cAAc,GAIf;IACC;;;;;;;;OAQG;IACH,MAAM,IAAI,GAAG,QAAQ,EAAE,KAAK,OAAO,IAAI,cAAc,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACtG,OAAO,kBAAkB,CAAC,EAAC,SAAS,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,IAAI,EAAC,CAAC,CAAA;AACnF,CAAC","sourcesContent":["import {PackageManager, installNodeModules, PackageJson} from '@shopify/cli-kit/node/node-package-manager'\nimport {CLI_KIT_VERSION} from '@shopify/cli-kit/common/version'\nimport {moduleDirectory, normalizePath} from '@shopify/cli-kit/node/path'\nimport {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 createAppPath = await packagePath('create-app')\n    const cliKitPath = await packagePath('cli-kit')\n    const pluginCloudflarePath = await packagePath('plugin-cloudflare')\n    const didYouMeanPath = await packagePath('plugin-did-you-mean')\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/create-app': createAppPath,\n      '@shopify/cli-kit': cliKitPath,\n      '@shopify/plugin-did-you-mean': didYouMeanPath,\n      '@shopify/plugin-cloudflare': pluginCloudflarePath,\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<void> {\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 installNodeModules({directory: normalizePath(from), packageManager, args})\n}\n"]}
+{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../src/utils/template/npm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,kBAAkB,EAAc,MAAM,4CAA4C,CAAA;AAC1G,OAAO,EAAC,eAAe,EAAE,aAAa,EAAC,MAAM,4BAA4B,CAAA;AACzE,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAC,eAAe,EAAC,MAAM,iCAAiC,CAAA;AAC/D,OAAO,EAAC,QAAQ,EAAC,MAAM,IAAI,CAAA;AAS3B,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,EAC1C,WAAW,EACX,KAAK,EACL,YAAY,GACiB;IAC7B,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,IAAI,EAAE,CAAA;IACzD,IAAI,YAAY,EAAE;QAChB,OAAO,WAAW,CAAC,YAAY,CAAC,cAAc,CAAC,CAAA;KAChD;SAAM;QACL,WAAW,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,eAAe,CAAA;KAC3D;IAED,OAAO,WAAW,CAAC,YAAY,CAAC,cAAc,CAAC,CAAA;IAE/C,IAAI,KAAK,EAAE;QACT,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,CAAA;QAExC,kDAAkD;QAClD,WAAW,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,OAAO,CAAA;QAElD,MAAM,mBAAmB,GAAG;YAC1B,cAAc,EAAE,OAAO;SACxB,CAAA;QAED,WAAW,CAAC,SAAS,GAAG,WAAW,CAAC,SAAS;YAC3C,CAAC,CAAC,EAAC,GAAG,WAAW,CAAC,SAAS,EAAE,GAAG,mBAAmB,EAAC;YACpD,CAAC,CAAC,mBAAmB,CAAA;QAEvB,WAAW,CAAC,WAAW,GAAG,WAAW,CAAC,WAAW;YAC/C,CAAC,CAAC,EAAC,GAAG,WAAW,CAAC,WAAW,EAAE,GAAG,mBAAmB,EAAC;YACtD,CAAC,CAAC,mBAAmB,CAAA;KACxB;IAED,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,WAAmB;IAC5C,MAAM,mBAAmB,GAAG,CAAC,MAAM,UAAU,CAAC,YAAY,WAAW,EAAE,EAAE;QACvE,IAAI,EAAE,WAAW;QACjB,GAAG,EAAE,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;KACtC,CAAC,CAAW,CAAA;IACb,OAAO,QAAQ,mBAAmB,EAAE,CAAA;AACtC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EAC3C,IAAI,EACJ,cAAc,GAIf;IACC;;;;;;;;OAQG;IACH,MAAM,IAAI,GAAG,QAAQ,EAAE,KAAK,OAAO,IAAI,cAAc,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACtG,OAAO,kBAAkB,CAAC,EAAC,SAAS,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,IAAI,EAAC,CAAC,CAAA;AACnF,CAAC","sourcesContent":["import {PackageManager, installNodeModules, PackageJson} from '@shopify/cli-kit/node/node-package-manager'\nimport {moduleDirectory, normalizePath} from '@shopify/cli-kit/node/path'\nimport {findPathUp} from '@shopify/cli-kit/node/fs'\nimport {CLI_KIT_VERSION} from '@shopify/cli-kit/common/version'\nimport {platform} from 'os'\n\ninterface UpdateCLIDependenciesOptions {\n  directory: string\n  packageJSON: PackageJson\n  local: boolean\n  useGlobalCLI: boolean\n}\n\nexport async function updateCLIDependencies({\n  packageJSON,\n  local,\n  useGlobalCLI,\n}: UpdateCLIDependenciesOptions): Promise<PackageJson> {\n  packageJSON.dependencies = packageJSON.dependencies || {}\n  if (useGlobalCLI) {\n    delete packageJSON.dependencies['@shopify/cli']\n  } else {\n    packageJSON.dependencies['@shopify/cli'] = CLI_KIT_VERSION\n  }\n\n  delete packageJSON.dependencies['@shopify/app']\n\n  if (local) {\n    const cliPath = await packagePath('cli')\n\n    // eslint-disable-next-line require-atomic-updates\n    packageJSON.dependencies['@shopify/cli'] = cliPath\n\n    const dependencyOverrides = {\n      '@shopify/cli': cliPath,\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<void> {\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 installNodeModules({directory: normalizePath(from), packageManager, args})\n}\n"]}

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

@@ -0,0 +1,153 @@
+import {
+  getDeepInstallNPMTasks,
+  updateCLIDependencies
+} from "../../chunk-4SXWHRL5.js";
+import "../../chunk-H7CRO63U.js";
+import {
+  installNodeModules
+} from "../../chunk-ZDCQCTOO.js";
+import {
+  inTemporaryDirectory,
+  mkdir,
+  readFile,
+  writeFile
+} from "../../chunk-WLJ2CNLG.js";
+import "../../chunk-FBB6KUZG.js";
+import "../../chunk-YLEF4RUH.js";
+import {
+  joinPath,
+  moduleDirectory,
+  normalizePath
+} from "../../chunk-G6FN5VUE.js";
+import "../../chunk-UVY6LL5H.js";
+import "../../chunk-7XQTD3L4.js";
+import "../../chunk-P4TVG45N.js";
+import "../../chunk-ZPB26OWQ.js";
+import "../../chunk-WCNR75S2.js";
+import {
+  describe,
+  globalExpect,
+  test,
+  vi
+} from "../../chunk-3JNB3A7C.js";
+import "../../chunk-3JLUTHGR.js";
+import "../../chunk-GXPKATXW.js";
+import {
+  init_cjs_shims
+} from "../../chunk-M63RTPGR.js";
+
+// src/utils/template/npm.test.ts
+init_cjs_shims();
+import { platform } from "os";
+vi.mock("os");
+vi.mock("@shopify/cli-kit/node/node-package-manager");
+vi.mock("@shopify/cli-kit/common/version", () => ({ CLI_KIT_VERSION: "1.2.3" }));
+describe("updateCLIDependencies", () => {
+  test("updates @shopify/cli and deletes @shopify/app if not using global CLI", async () => {
+    const mockPackageJSON = {};
+    const directory = moduleDirectory(import.meta.url);
+    await updateCLIDependencies({ packageJSON: mockPackageJSON, local: false, directory, useGlobalCLI: false });
+    globalExpect(mockPackageJSON.dependencies["@shopify/cli"]).toBe("1.2.3");
+    globalExpect(mockPackageJSON.dependencies["@shopify/app"]).toBeUndefined();
+  });
+  test("removes @shopify/cli and @shopify/app if using global CLI", async () => {
+    const mockPackageJSON = {};
+    const directory = moduleDirectory(import.meta.url);
+    await updateCLIDependencies({ packageJSON: mockPackageJSON, local: false, directory, useGlobalCLI: true });
+    globalExpect(mockPackageJSON.dependencies["@shopify/cli"]).toBeUndefined();
+    globalExpect(mockPackageJSON.dependencies["@shopify/app"]).toBeUndefined();
+  });
+  test("does not update overrides or resolutions if local is false", async () => {
+    const mockPackageJSON = { overrides: {}, resolutions: {} };
+    const directory = moduleDirectory(import.meta.url);
+    await updateCLIDependencies({ packageJSON: mockPackageJSON, local: false, directory, useGlobalCLI: false });
+    globalExpect(mockPackageJSON.overrides["@shopify/cli"]).toBeUndefined();
+    globalExpect(mockPackageJSON.overrides["@shopify/app"]).toBeUndefined();
+    globalExpect(mockPackageJSON.overrides["@shopify/cli-kit"]).toBeUndefined();
+    globalExpect(mockPackageJSON.resolutions["@shopify/cli"]).toBeUndefined();
+    globalExpect(mockPackageJSON.resolutions["@shopify/app"]).toBeUndefined();
+    globalExpect(mockPackageJSON.resolutions["@shopify/cli-kit"]).toBeUndefined();
+  });
+  test("updates overrides for @shopify/cli if local is true", async () => {
+    const mockPackageJSON = {};
+    const directory = moduleDirectory(import.meta.url);
+    await updateCLIDependencies({ packageJSON: mockPackageJSON, local: true, directory, useGlobalCLI: false });
+    const dependencyOveride = mockPackageJSON.overrides["@shopify/cli"];
+    const dependencyPath = joinPath(dependencyOveride.replace("file:", ""), "package.json");
+    const dependencyJSON = JSON.parse(await readFile(dependencyPath));
+    globalExpect(dependencyJSON.name).toBe("@shopify/cli");
+  });
+  test("updates resolutions for @shopify/cli if local is true", async () => {
+    const mockPackageJSON = {};
+    const directory = moduleDirectory(import.meta.url);
+    await updateCLIDependencies({ packageJSON: mockPackageJSON, local: true, directory, useGlobalCLI: false });
+    const dependencyResolution = mockPackageJSON.resolutions["@shopify/cli"];
+    const dependencyPath = joinPath(dependencyResolution.replace("file:", ""), "package.json");
+    const dependencyJSON = JSON.parse(await readFile(dependencyPath));
+    globalExpect(dependencyJSON.name).toBe("@shopify/cli");
+  });
+  test("updates dependency for @shopify/cli if local is true", async () => {
+    const mockPackageJSON = {};
+    const directory = moduleDirectory(import.meta.url);
+    await updateCLIDependencies({ packageJSON: mockPackageJSON, local: true, directory, useGlobalCLI: false });
+    const dependencyResolution = mockPackageJSON.dependencies["@shopify/cli"];
+    const dependencyPath = joinPath(dependencyResolution.replace("file:", ""), "package.json");
+    const dependencyJSON = JSON.parse(await readFile(dependencyPath));
+    globalExpect(dependencyJSON.name).toBe("@shopify/cli");
+  });
+  test("does not change existing values", async () => {
+    const mockPackageJSON = {
+      name: "",
+      author: "",
+      scripts: {},
+      dependencies: {
+        mock: "value"
+      },
+      devDependencies: {
+        mock: "value"
+      },
+      resolutions: {
+        mock: "value"
+      },
+      overrides: {
+        mock: "value"
+      }
+    };
+    const directory = moduleDirectory(import.meta.url);
+    await updateCLIDependencies({ packageJSON: mockPackageJSON, local: false, directory, useGlobalCLI: false });
+    globalExpect(mockPackageJSON.dependencies.mock).toBe("value");
+    globalExpect(mockPackageJSON.overrides.mock).toBe("value");
+    globalExpect(mockPackageJSON.resolutions.mock).toBe("value");
+  });
+});
+describe("getDeepInstallNPMTasks", () => {
+  async function mockAppFolder(callback) {
+    await inTemporaryDirectory(async (tmpDir) => {
+      await mkdir(joinPath(tmpDir, "web"));
+      await mkdir(joinPath(tmpDir, "web", "frontend"));
+      await Promise.all([
+        writeFile(joinPath(tmpDir, "package.json"), "{}"),
+        writeFile(joinPath(tmpDir, "web", "package.json"), "{}"),
+        writeFile(joinPath(tmpDir, "web", "frontend", "package.json"), "{}")
+      ]);
+      return callback(tmpDir);
+    });
+  }
+  const defaultArgs = {
+    packageManager: "npm",
+    didInstallEverything: () => {
+    }
+  };
+  test.each([["darwin"], ["win32"]])("each task installs dependencies when the os is %s", async (operativeSystem) => {
+    await mockAppFolder(async (tmpDir) => {
+      const expectedArgs = operativeSystem === "win32" ? ["--network-concurrency", "1"] : [];
+      vi.mocked(platform).mockReturnValue(operativeSystem);
+      await getDeepInstallNPMTasks({ ...defaultArgs, packageManager: "yarn", from: tmpDir });
+      globalExpect(installNodeModules).toHaveBeenCalledWith({
+        directory: `${normalizePath(tmpDir)}`,
+        packageManager: "yarn",
+        args: expectedArgs
+      });
+    });
+  });
+});

package/oclif.manifest.json

@@ -98,5 +98,5 @@
       "summary": "Create a new app project"
     }
   },
-  "version": "3.58.2"
+  "version": "3.59.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/create-app",
-  "version": "3.58.2",
+  "version": "3.59.0",
   "private": false,
   "description": "A CLI tool to create a new Shopify app.",
   "keywords": [
@@ -42,13 +42,11 @@
       "../../.eslintrc.cjs"
     ]
   },
-  "dependencies": {
-    "@oclif/core": "3.19.6",
-    "@shopify/cli-kit": "3.58.2"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@types/node": "18.19.3",
-    "vite": "^4.4.9",
+    "esbuild-plugin-copy": "^2.1.1",
+    "@vitest/coverage-istanbul": "^0.34.3",
     "vitest": "^0.34.3"
   },
   "engines": {
@@ -77,6 +75,7 @@
   },
   "scripts": {
     "build": "nx build",
+    "bundle": "nx bundle",
     "clean": "nx clean",
     "lint": "nx lint",
     "lint:fix": "nx lint:fix",

package/dist/constants.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/constants.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=constants.js.map

package/dist/constants.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"","sourcesContent":[""]}

package/dist/utils/versions.d.ts

@@ -1 +0,0 @@
-export declare function cliVersion(): Promise<string>;

package/dist/utils/versions.js

@@ -1,21 +0,0 @@
-import { BugError } from '@shopify/cli-kit/node/error';
-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 findPathUp('@shopify/cli/package.json', {
-        cwd: dirname(fileURLToPath(import.meta.url)),
-        type: 'file',
-        allowSymlinks: true,
-    })) ??
-        (await findPathUp('packages/cli/package.json', {
-            cwd: dirname(fileURLToPath(import.meta.url)),
-            type: 'file',
-        }));
-    if (!cliPackageJsonpath) {
-        throw new BugError("Couldn't determine the version of the CLI");
-    }
-    const packageJson = JSON.parse(await readFile(cliPackageJsonpath));
-    return packageJson.version;
-}
-//# sourceMappingURL=versions.js.map

package/dist/utils/versions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../src/utils/versions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,6BAA6B,CAAA;AACpD,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,QAAQ,CAAC,2CAA2C,CAAC,CAAA;KAChE;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 {BugError} from '@shopify/cli-kit/node/error'\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 BugError(\"Couldn't determine the version of the CLI\")\n  }\n  const packageJson = JSON.parse(await readFile(cliPackageJsonpath))\n  return packageJson.version\n}\n"]}