@swell/cli 2.9.7 → 2.9.8

package/dist/app-command.d.ts

@@ -14,6 +14,7 @@ export declare abstract class AppCommand extends SwellCommand {
     static baseFlags: {
         'app-path': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
+    static requiresSwellConfig: boolean;
     appPath: string;
     swellConfig: LocalApp;
     init(): Promise<void>;

package/dist/app-command.js

@@ -1,6 +1,7 @@
 import { Flags } from '@oclif/core';
 import * as path from 'node:path';
-import { default as swellConfig } from './lib/app-config.js';
+import { default as swellConfig, swellConfigFileExists, } from './lib/app-config.js';
+import style from './lib/style.js';
 import { SwellCommand } from './swell-command.js';
 /**
  * A base class for Swell CLI commands that do not require an app to be saved
@@ -20,6 +21,8 @@ export class AppCommand extends SwellCommand {
             description: 'Path to your app directory',
         }),
     };
+    // set to false for commands that may run before an app directory exists (pull)
+    static requiresSwellConfig = true;
     // the local path to the app directory
     appPath = '';
     // local app configuration, what developers define
@@ -35,8 +38,17 @@ export class AppCommand extends SwellCommand {
         // ensure the base flags are available
         klass.flags = { ...klass.flags, ...AppCommand.baseFlags };
         const { flags } = await this.parse(klass);
+        const targetDir = flags['app-path']
+            ? path.resolve(flags['app-path'])
+            : process.cwd();
+        // swell.json is only ever looked up in this exact directory
+        // Searching parent directories (the previous behavior) can silently pick up an unrelated app's config
+        if (klass.requiresSwellConfig &&
+            !(await swellConfigFileExists(path.join(targetDir, 'swell.json')))) {
+            this.error(`No swell.json found in ${style.path(targetDir)}. Run this command from your app's root directory, or pass --app-path.`);
+        }
         // if the user passed an app path, use it: reload the app config
-        this.swellConfig = await swellConfig(flags['app-path']);
+        this.swellConfig = await swellConfig(targetDir);
         this.appPath = path.resolve(this.swellConfig.swDirPath);
     }
 }

package/dist/commands/app/pull.d.ts

@@ -4,6 +4,7 @@ export default class AppPull extends PushAppCommand {
         appId: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
         targetPath: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
     };
+    static requiresSwellConfig: boolean;
     static description: string;
     static examples: string[];
     static flags: {

package/dist/commands/app/pull.js

@@ -11,6 +11,7 @@ export default class AppPull extends PushAppCommand {
             description: 'path to download app files into',
         }),
     };
+    static requiresSwellConfig = false;
     static description = `Pull all app files, a specific file, or a specific configuration
 type from an app in your store's test environment to your local machine.
 

package/dist/create-app-command.js

@@ -209,12 +209,11 @@ export class CreateAppCommand extends SwellCommand {
         await fs.writeFile(configFilePath, content, 'utf8');
     }
     async createAppConfigFolders(swellConfig) {
+        const configPath = path.dirname(swellConfig.path);
         for (const type of getAllConfigPaths(swellConfig.get('type'))) {
             // Create a config folder
             // eslint-disable-next-line no-await-in-loop
-            await execAsync(`mkdir -p ${type}`, {
-                cwd: path.dirname(swellConfig.path),
-            });
+            await fs.mkdir(path.join(configPath, type), { recursive: true });
         }
     }
     async createFrontendApp(swellConfig, flags, directCreate, kind) {
@@ -300,8 +299,8 @@ export class CreateAppCommand extends SwellCommand {
             }
             spinner.start(`Creating ${projectType?.name} frontend app (this may take a while)...`);
             try {
-                await execAsync(`mkdir -p frontend`, {
-                    cwd: configPath,
+                await fs.mkdir(path.join(configPath, 'frontend'), {
+                    recursive: true,
                 });
                 // SWELL_LOCAL_TEMPLATE_PATH overrides the scaffold for local dev — copies
                 // the directory at the path into frontend/ instead of running the install
@@ -417,16 +416,14 @@ export class CreateAppCommand extends SwellCommand {
                 this.log();
                 spinner.start(`Creating theme template...`);
                 try {
-                    await execAsync(`mkdir -p theme`, {
-                        cwd: configPath,
-                    });
+                    await fs.mkdir(path.join(configPath, 'theme'), { recursive: true });
                     for (const themeConfig of defaultThemeConfigs.results) {
                         const filePath = themeConfig.file_path.replace(/^frontend\/theme-template\//, '');
                         const fileContent = themeConfig.file_data;
                         const isJson = filePath.endsWith('.json');
                         // eslint-disable-next-line no-await-in-loop
-                        await execAsync(`mkdir -p ${path.dirname(filePath)}`, {
-                            cwd: configPath,
+                        await fs.mkdir(path.join(configPath, path.dirname(filePath)), {
+                            recursive: true,
                         });
                         // eslint-disable-next-line no-await-in-loop
                         await (isJson

package/dist/lib/apps/index.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" resolution-mode="require"/>
 import { AppConfig } from './app-config.js';
 export { AppConfig, FunctionProcessingError, IgnoringFileError, } from './app-config.js';
-export { allBaseFilesInDir, allConfigDirsPaths, allConfigFilesInDir, allConfigFilesPaths, allConfigFilesPathsByType, getAllConfigPaths, globAllFilesByPath, isPathDirectory, } from './paths.js';
+export { allBaseFilesInDir, allConfigDirsPaths, allConfigFilesInDir, allConfigFilesPaths, allConfigFilesPathsByType, getAllConfigPaths, globAllFilesByPath, isPathDirectory, toPosixPath, } from './paths.js';
 export declare const PUSH_CONCURRENCY = 3;
 /**
  * An app as defined by the Swell API. This is different than an app

package/dist/lib/apps/index.js

@@ -5,7 +5,7 @@ import * as path from 'node:path';
 import { detectPackageManager, transformCommand } from '../package-manager.js';
 import { AppConfig } from './app-config.js';
 export { AppConfig, FunctionProcessingError, IgnoringFileError, } from './app-config.js';
-export { allBaseFilesInDir, allConfigDirsPaths, allConfigFilesInDir, allConfigFilesPaths, allConfigFilesPathsByType, getAllConfigPaths, globAllFilesByPath, isPathDirectory, } from './paths.js';
+export { allBaseFilesInDir, allConfigDirsPaths, allConfigFilesInDir, allConfigFilesPaths, allConfigFilesPathsByType, getAllConfigPaths, globAllFilesByPath, isPathDirectory, toPosixPath, } from './paths.js';
 export const PUSH_CONCURRENCY = 3;
 export var SwellJsonFields;
 (function (SwellJsonFields) {

package/dist/lib/apps/paths.d.ts

@@ -1,5 +1,6 @@
 import { type GlobbyFilterFunction } from 'globby';
 import { ConfigType } from './index.js';
+export declare function toPosixPath(inputPath: string): string;
 export declare function globAllFilesByPath(appPath: string, dirPath?: string): Promise<string[]>;
 export declare function getGlobIgnorePathsChecker(appPath: string): Promise<GlobbyFilterFunction>;
 export declare function allConfigDirsPaths(appPath: string): Generator<{

package/dist/lib/apps/paths.js

@@ -27,11 +27,15 @@ function globOptions(appPath, options) {
         ],
     };
 }
+// use forward slashes to support Windows
+export function toPosixPath(inputPath) {
+    return inputPath.split(path.sep).join('/');
+}
 function globFilesSync(pattern, appPath, dirPath = '.', options = {}) {
-    return globbySync(`${dirPath}${path.sep}${pattern}`, globOptions(appPath, options));
+    return globbySync(`${toPosixPath(dirPath)}/${pattern}`, globOptions(appPath, options));
 }
 function globFiles(pattern, appPath, dirPath = '.', options = {}) {
-    return globby(`${dirPath}${path.sep}${pattern}`, globOptions(appPath, options));
+    return globby(`${toPosixPath(dirPath)}/${pattern}`, globOptions(appPath, options));
 }
 export function globAllFilesByPath(appPath, dirPath) {
     return globFiles('**', appPath, dirPath);

package/dist/push-app-command.js

@@ -6,7 +6,7 @@ import * as path from 'node:path';
 import Stream from 'node:stream';
 import ora from 'ora';
 import { default as swellConfig } from './lib/app-config.js';
-import { ConfigType, getFrontendProjectValidValues, allConfigFilesInDir, CUSTOM_FRAMEWORK_SLUG, appConfigFromFile, filePathExistsAsync, findAppConfig, getConfigTypeFromPath, getConfigTypeKeyFromValue, getFrontendProjectType, getProjectCommands, globAllFilesByPath, hashString, isPathDirectory, } from './lib/apps/index.js';
+import { ConfigType, getFrontendProjectValidValues, allConfigFilesInDir, CUSTOM_FRAMEWORK_SLUG, appConfigFromFile, filePathExistsAsync, findAppConfig, getConfigTypeFromPath, getConfigTypeKeyFromValue, getFrontendProjectType, getProjectCommands, globAllFilesByPath, hashString, isPathDirectory, toPosixPath, } from './lib/apps/index.js';
 import { getGlobIgnorePathsChecker } from './lib/apps/paths.js';
 import { slugFromApp } from './lib/apps/slug.js';
 import { default as localConfig } from './lib/config.js';
@@ -32,14 +32,12 @@ export class PushAppCommand extends RemoteAppCommand {
         if (!filename) {
             return;
         }
-        if (this.watchingIgnoreFilter && this.watchingIgnoreFilter(filename)) {
+        const configFile = toPosixPath(filename);
+        if (this.watchingIgnoreFilter && this.watchingIgnoreFilter(configFile)) {
             return;
         }
-        const configFile = filename;
-        const pathParsed = path.parse(configFile);
-        const fileDirs = pathParsed.dir.split(path.sep);
         // only the first directory is relevant for us
-        const configDir = fileDirs[0];
+        const configDir = configFile.split('/')[0];
         // we only want to watch files in the root of the app directory
         // and ignore build files etc
         // TODO: renaming a folder doesn't seem to work
@@ -433,7 +431,7 @@ export class PushAppCommand extends RemoteAppCommand {
     async getFrontendDeploymentHash() {
         const localConfigs = await this.getLocalAppConfigs();
         let frontendHashes = localConfigs
-            .filter((config) => config.filePath?.startsWith(`frontend${path.sep}`))
+            .filter((config) => config.filePath?.startsWith('frontend/'))
             .map((config) => config.hash)
             .sort()
             .join('|');
@@ -675,16 +673,18 @@ export class PushAppCommand extends RemoteAppCommand {
         this.log(`View your storefront at ${style.link(this.storefrontFrontendUrl(currentStore, storefront, branchId))}.`);
     }
     async pushFile(relativePath) {
-        const basePath = relativePath.split(path.sep)[0];
+        const relativePathPosix = toPosixPath(relativePath);
+        const basePath = relativePathPosix.split('/')[0];
         const configType = getConfigTypeFromPath(basePath) || ConfigType.FILE;
-        const config = await appConfigFromFile(relativePath, configType, this.appPath);
+        const config = await appConfigFromFile(relativePathPosix, configType, this.appPath);
         await this.pushRemoteFile(config);
     }
     async pushFilePath(relativePath, force) {
         const topDir = relativePath.split(path.sep)[0];
         const configType = getConfigTypeFromPath(topDir) || ConfigType.FILE;
         const configTypeKey = getConfigTypeKeyFromValue(configType) || ConfigType.FILE;
-        const exAppConfigs = (this.app?.configs || []).filter((config) => config.filePath?.startsWith(`${relativePath}/`));
+        const relativePathPosix = toPosixPath(relativePath);
+        const exAppConfigs = (this.app?.configs || []).filter((config) => config.filePath?.startsWith(`${relativePathPosix}/`));
         const promises = [];
         for (const { configFile } of allConfigFilesInDir(this.appPath, relativePath, configTypeKey)) {
             promises.push(appConfigFromFile(configFile, configType, this.appPath));

package/oclif.manifest.json

@@ -708,6 +708,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
+      "requiresSwellConfig": true,
       "delayOrientation": false,
       "orientation": {
         "env": "test"
@@ -851,6 +852,7 @@
       "strict": true,
       "summary": "Show information about your Swell app.",
       "enableJsonFlag": false,
+      "requiresSwellConfig": true,
       "delayOrientation": false,
       "isESM": true,
       "relativePath": [
@@ -1101,6 +1103,7 @@
       "strict": true,
       "summary": "Install an existing app in another store environment.",
       "enableJsonFlag": false,
+      "requiresSwellConfig": true,
       "delayOrientation": false,
       "orientation": {
         "env": "test"
@@ -1157,6 +1160,7 @@
       "pluginType": "core",
       "strict": true,
       "summary": "Pull app files from Swell to your local machine.",
+      "requiresSwellConfig": false,
       "orientation": {
         "env": "test"
       },
@@ -2298,6 +2302,7 @@
       "strict": true,
       "summary": "Create tests scaffolding for your Swell app.",
       "enableJsonFlag": false,
+      "requiresSwellConfig": true,
       "helpMeta": {
         "usageDirect": "[-y]"
       },
@@ -3326,6 +3331,7 @@
       "pluginName": "@swell/cli",
       "pluginType": "core",
       "summary": "Pull theme files from Swell to your local machine.",
+      "requiresSwellConfig": false,
       "orientation": {
         "env": "test"
       },
@@ -3588,5 +3594,5 @@
       ]
     }
   },
-  "version": "2.9.7"
+  "version": "2.9.8"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.9.7",
+  "version": "2.9.8",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [