@swell/cli 2.0.7 → 2.0.9

package/dist/commands/theme/dev.d.ts

@@ -3,6 +3,7 @@ export default class AppThemeDev extends PushAppCommand {
     static examples: string[];
     static flags: {
         bundle: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         local: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         'no-push': import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         'storefront-id': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;

package/dist/commands/theme/dev.js

@@ -21,6 +21,10 @@ export default class AppThemeDev extends PushAppCommand {
         bundle: Flags.boolean({
             description: 'bundle assets',
         }),
+        force: Flags.boolean({
+            default: false,
+            description: 'force push all configurations',
+        }),
         local: Flags.boolean({
             description: 'connect to a running local storefront app dev server',
         }),
@@ -45,13 +49,18 @@ export default class AppThemeDev extends PushAppCommand {
     }
     async run() {
         const { flags } = await this.parse(AppThemeDev);
-        const { local } = flags;
+        const { force, local } = flags;
         const noPush = flags['no-push'];
         if (!(await this.ensureAppExists(undefined, false))) {
             return;
         }
+        if (local) {
+            const currentStore = localConfig.getDefaultStore();
+            const sessionId = localConfig.getSessionId(currentStore);
+            this.storefrontLocalUrl = this.localFrontendUrl(currentStore, sessionId);
+        }
         if (!noPush) {
-            await this.pushAppConfigs();
+            await this.pushAppConfigs(force);
         }
         await this.getStorefrontToPush(flags);
         this.logStorefrontConnected();
@@ -136,7 +145,7 @@ export default class AppThemeDev extends PushAppCommand {
         const freePort = (await getPort({ port: portNumbers(3000, 3100) })) || FALLBACK_PORT;
         spinner.start(`Starting theme dev server on port ${freePort}...`);
         const storefrontUrl = local
-            ? this.localFrontendUrl(currentStore, sessionId)
+            ? this.storefrontLocalUrl
             : this.storefrontFrontendUrl(currentStore, this.storefront, undefined, true);
         const bs = BrowserSync.create();
         bs.init({

package/dist/lib/apps/app-config.js

@@ -80,7 +80,7 @@ class AppConfig {
             this.appPath = path.join(appPath, filePath);
         }
         if (filePathExists(this.appPath)) {
-            this.fileHash = hashFile(this.appPath);
+            this.fileHash = hashFile(this.appPath, undefined, filePath);
             this.hash = this.hash || this.fileHash;
             this.fileData = fs.readFileSync(this.appPath);
             this.fileContent = this.fileData.toString('utf8');

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

@@ -131,7 +131,7 @@ declare function filePathExists(filePath: string): boolean;
 declare function writeFile(file: string, data: string): Promise<void>;
 declare function deleteFile(file: string): Promise<void>;
 declare function writeJsonFile(file: string, data?: any): Promise<void>;
-declare function hashFile(filePath: string, fileContents?: Buffer): string;
+declare function hashFile(filePath: string, fileContents?: Buffer, relativePath?: string): string;
 declare function hashString(contents: string): string;
 declare function appAssetImage(appPath: string, fileName: string): string | undefined;
 declare function appConfigFromFile(filePath: string, configType: ConfigType, appPath: string): AppConfig;

package/dist/lib/apps/index.js

@@ -184,11 +184,12 @@ async function writeJsonFile(file, data = {}) {
     return writeFile(file, `${JSON.stringify(data, null, 2)}\n`);
 }
 // Hash method adapted from wrangler-sdk
-function hashFile(filePath, fileContents) {
+function hashFile(filePath, fileContents, relativePath) {
     const contents = fileContents ?? fs.readFileSync(filePath);
     const base64Contents = contents.toString('base64');
-    const extension = path.extname(filePath).slice(1);
-    return hashString(base64Contents + extension);
+    // Include relative file path because we typically cache by hash including file metadata
+    // This allows de-duplication of cache entries for the same file contents
+    return hashString(base64Contents + relativePath);
 }
 function hashString(contents) {
     return blake3hash(contents).toString('hex').slice(0, 32);

package/dist/push-app-command.js

@@ -110,7 +110,8 @@ export class PushAppCommand extends RemoteAppCommand {
         if (this.app.type === 'theme') {
             themeAppId = this.app.id;
             const storefrontApps = await this.handleRequestErrors(async () => this.api.get({
-                adminPath: `/apps?type=storefront&kind=shop`,
+                // TODO: improve this filter query
+                adminPath: `/apps?type=storefront&$or[0][kind]=shop&$or[1][kind]=`,
             }));
             const compatibleStorefrontApps = storefrontApps.results.filter((app) => app.installed &&
                 app.storefront?.theme?.provider === 'app' &&

package/dist/remote-app-command.d.ts

@@ -11,6 +11,7 @@ export declare abstract class RemoteAppCommand extends AppCommand {
     appCreated: boolean;
     appType: string;
     storefront?: any;
+    storefrontLocalUrl?: string;
     themeSyncApp?: boolean;
     appFrontendUrl(storeId: string, installedAppId: string): string;
     cleanRemoteConfigs(remoteConfigs: AppConfig[], deleteDeprecated?: boolean): Promise<AppConfig[]>;

package/dist/remote-app-command.js

@@ -26,6 +26,8 @@ export class RemoteAppCommand extends AppCommand {
     appType = 'any';
     // API instance of the target storefront, if applicable
     storefront = null;
+    // Indicates we are syncing with a local app frontend via proxy
+    storefrontLocalUrl = '';
     // Indicates app configs are being synced along with theme configs
     themeSyncApp = false;
     appFrontendUrl(storeId, installedAppId) {
@@ -334,6 +336,9 @@ export class RemoteAppCommand extends AppCommand {
                 ...configJson,
                 ...(themeId ? { theme_id: themeId } : undefined),
                 ...(this.themeSyncApp ? { $sync_app: true } : undefined),
+                ...(this.storefrontLocalUrl
+                    ? { $storefront_local_url: this.storefrontLocalUrl }
+                    : undefined),
             },
         });
     }
@@ -352,7 +357,7 @@ export class RemoteAppCommand extends AppCommand {
                 try {
                     const localConfig = localBatchConfigs.find((config) => config.filePath === batchConfig.filePath);
                     if (localConfig) {
-                        const hash = hashFile(batchConfig.appPath);
+                        const hash = hashFile(batchConfig.appPath, undefined, batchConfig.filePath);
                         if (hash === batchConfig.hash) {
                             return false;
                         }

package/oclif.manifest.json

@@ -1473,6 +1473,12 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "force": {
+          "description": "force push all configurations",
+          "name": "force",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "local": {
           "description": "connect to a running local storefront app dev server",
           "name": "local",
@@ -1835,5 +1841,5 @@
       ]
     }
   },
-  "version": "2.0.7"
+  "version": "2.0.9"
 }

package/package.json

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