@swell/cli 2.9.23 → 2.9.25

package/dist/commands/app/dev.js

@@ -9,7 +9,7 @@ import * as path from 'node:path';
 import ora from 'ora';
 import { ConfigType, allConfigFilesInDir, appConfigFromFile, } from '../../lib/apps/index.js';
 import { bundleFunction } from '../../lib/bundle.js';
-import { getLocalFrontendHost } from '../../lib/constants.js';
+import { FUNCTION_COMPATIBILITY_DATE, getLocalFrontendHost, } from '../../lib/constants.js';
 import { analyzeFunctionSource, hasKindDiagnostic, } from '../../lib/function-source-analysis.js';
 import { detectPackageManager, getExecSpawnArgs, } from '../../lib/package-manager.js';
 import style from '../../lib/style.js';
@@ -255,7 +255,7 @@ export default class AppDev extends PushAppCommand {
         return `
 name = "${functionName}"
 main = "${bundledPath}"
-compatibility_date = "2023-05-18"
+compatibility_date = "${FUNCTION_COMPATIBILITY_DATE}"
 
 [vars]
 ENVIRONMENT = "development"

package/dist/commands/schema.js

@@ -1,5 +1,5 @@
 import { Args, Flags } from '@oclif/core';
-import { Ajv } from 'ajv';
+import { Ajv2020 } from 'ajv/dist/2020.js';
 import ajvErrors from 'ajv-errors';
 import addFormats from 'ajv-formats';
 import * as fs from 'node:fs/promises';
@@ -200,7 +200,8 @@ export default class Schema extends SwellCommand {
             throw new Error(`Failed to fetch bundled schema: ${response.statusText}`);
         }
         const schema = await response.json();
-        const ajv = new Ajv({
+        // The schemas declare draft 2020-12, which the default Ajv class rejects
+        const ajv = new Ajv2020({
             allErrors: true,
             strict: false,
         });
@@ -211,7 +212,7 @@ export default class Schema extends SwellCommand {
         if (!valid) {
             const { errors } = validate;
             const errorLength = errors?.length;
-            let errorTitle = 'Invalid model definition';
+            let errorTitle = `Invalid ${type} definition`;
             if (typeof errorLength === 'number' && errorLength > 1) {
                 errorTitle += ` (${errorLength} errors)`;
             }
@@ -222,7 +223,7 @@ export default class Schema extends SwellCommand {
             }
             throw new Error(`${errorTitle}\n${errorMessage}`);
         }
-        this.log('Valid model definition');
+        this.log(`Valid ${type} definition`);
     }
     async validateFunction(file) {
         const accessError = await fs.access(file, fs.constants.F_OK).then(() => null, (error) => error);

package/dist/lib/constants.d.ts

@@ -1,6 +1,7 @@
 export declare const API_BASE_URL: string;
 export declare const LOCAL_PROXY_PROVIDER: string;
 export declare const SCHEMAS_BASE_URL: string;
+export declare const FUNCTION_COMPATIBILITY_DATE = "2023-05-18";
 export declare function getAdminApiBaseUrl(storeId: string): string;
 export declare function getFrontendApiBaseUrl(storeId: string): string;
 export declare function getLoginHost(storeId?: string): string;

package/dist/lib/constants.js

@@ -17,6 +17,9 @@ const STOREFRONT_FRONTEND_HOST = env.get('STOREFRONT_FRONTEND_HOST') ||
     defaultEnv.STOREFRONT_FRONTEND_HOST;
 export const LOCAL_PROXY_PROVIDER = env.get('LOCAL_PROXY_PROVIDER') || defaultEnv.LOCAL_PROXY_PROVIDER;
 export const SCHEMAS_BASE_URL = env.get('SCHEMAS_BASE_URL') || defaultEnv.SCHEMAS_BASE_URL;
+// Workers compatibility date for running app functions locally, in swell app
+// dev and in tests
+export const FUNCTION_COMPATIBILITY_DATE = '2023-05-18';
 // helpers to get constants with replacements
 export function getAdminApiBaseUrl(storeId) {
     return ADMIN_API_BASE_URL.replace('${STORE_ID}', storeId);

package/dist/lib/create/tests/templates/mock-request.js

@@ -46,7 +46,12 @@ export function createMockRequest(options: MockRequestOptions = {}): SwellReques
   } = options;
 
   const requestHeaders = new Headers(headers);
-  const requestQuery = { ...Object.fromEntries(new URL(url).searchParams), ...query };
+  // The app tsconfig's webworker lib does not type URLSearchParams as iterable
+  const urlQuery: Record<string, string> = {};
+  new URL(url).searchParams.forEach((value, key) => {
+    urlQuery[key] = value;
+  });
+  const requestQuery = { ...urlQuery, ...query };
   const originalRequest = new Request(url, {
     method,
     headers: requestHeaders,

package/dist/lib/create/tests/templates/setup-globals.js

@@ -35,10 +35,37 @@ class SwellRejectionImpl extends Error {
   }
 }
 
+// Builds the body and content type like the deployed function runtime
+class SwellResponseImpl extends Response {
+  constructor(
+    data?: string | object,
+    options: ResponseInit & { headers?: Record<string, string> } = {},
+  ) {
+    const headers: Record<string, string> = {};
+    let body = "";
+
+    if (typeof data === "string") {
+      body = data;
+      headers["Content-Type"] = "text/plain;charset=UTF-8";
+    } else if (data !== undefined) {
+      body = JSON.stringify(data, null, 2);
+      headers["Content-Type"] = "application/json;charset=UTF-8";
+    }
+
+    super(body, {
+      status: 200,
+      ...options,
+      headers: { ...headers, ...options.headers },
+    });
+  }
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 (globalThis as any).SwellError = SwellError;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 (globalThis as any).SwellRejection = SwellRejectionImpl;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+(globalThis as any).SwellResponse = SwellResponseImpl;
 
 export {};
 `;

package/dist/lib/create/tests/templates/vitest-config.js

@@ -1,3 +1,4 @@
+import { FUNCTION_COMPATIBILITY_DATE } from '../../../constants.js';
 export function vitestConfigTemplate(options) {
     return `\
 import { defineWorkersConfig } from "@cloudflare/vitest-pool-workers/config";
@@ -106,6 +107,7 @@ export default defineWorkersConfig({
         singleWorker: true,
         isolatedStorage: true,
         miniflare: {
+          compatibilityDate: "${FUNCTION_COMPATIBILITY_DATE}",
           bindings: {
             SWELL_STORE_ID: sdkAuth.storeId,
             SWELL_SESSION_ID: sdkAuth.sessionId,

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

@@ -82,6 +82,7 @@ export declare abstract class PushAppCommand extends RemoteAppCommand {
     logDashboardUrl(flags: {
         [flag: string]: any;
     }): void;
+    logDeployedStorefrontUrl(): Promise<void>;
     logStorefrontConnected(): void;
     logStorefrontFrontendUrl(storefront?: any, branchId?: string): void;
     logReleaseDetailsHint(error: any): void;

package/dist/push-app-command.js

@@ -286,6 +286,9 @@ export class PushAppCommand extends RemoteAppCommand {
             }
             await this.handleRequestErrors(async () => this.api.post({ adminPath: `/apps/${this.app.id}/frontend-package` }, { body: { package: serialized } }));
             this.log(`Deployed managed frontend package ${pkg.digest}.`);
+            if (log !== false) {
+                await this.logDeployedStorefrontUrl();
+            }
             return;
         }
         if (this.app.frontend?.hosting === 'managed' &&
@@ -306,10 +309,10 @@ export class PushAppCommand extends RemoteAppCommand {
             await this.updateFrontendDeployment(currentStore, projectType, deploymentUrl, deploymentHash);
         }
         if (log !== false) {
-            if (this.app.type === 'storefront' && this.storefront) {
-                this.logStorefrontFrontendUrl(this.storefront);
+            if (this.app.type === 'storefront') {
+                await this.logDeployedStorefrontUrl();
             }
-            else if (this.app.type !== 'storefront') {
+            else {
                 // Get updated app with `installed` property
                 this.app = await this.getApp(this.app.id);
                 this.logAppFrontendUrl();
@@ -737,6 +740,21 @@ export class PushAppCommand extends RemoteAppCommand {
         const currentStore = localConfig.getDefaultStore();
         this.log(`View the ${style.appConfigValue(this.app.name)} app in your dashboard at ${style.link(this.dashboardUrl(flags, currentStore))}.`);
     }
+    // `swell app push` deploys without choosing a storefront, so fall back to
+    // the app's latest one in this environment
+    async logDeployedStorefrontUrl() {
+        if (this.app.type !== 'storefront') {
+            return;
+        }
+        // The frontend is already deployed, so a failed lookup only skips the link
+        const storefront = this.storefront ||
+            (await this.api
+                .get({ adminPath: `/apps/${this.app.id}/storefront` })
+                .catch(() => null));
+        if (storefront) {
+            this.logStorefrontFrontendUrl(storefront);
+        }
+    }
     logStorefrontConnected() {
         if (!this.storefront) {
             this.error('Storefront not connected');

package/oclif.manifest.json

@@ -3606,5 +3606,5 @@
       ]
     }
   },
-  "version": "2.9.23"
+  "version": "2.9.25"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.9.23",
+  "version": "2.9.25",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [
@@ -117,7 +117,8 @@
     "test": "mocha --forbid-only --ignore \"**/node_modules/**\" \"test/**/*.test.ts\"",
     "publish-alpha": "npm version prerelease --preid=alpha && npm publish --tag alpha",
     "test:frontend-packages": "npm run build && node test/fixtures/managed-frontend/verify.mjs && node test/fixtures/managed-frontend/verify-react-worker.mjs",
-    "test:frontend-scaffolds": "npm run build && node test/fixtures/managed-frontend/verify-scaffolds.mjs"
+    "test:frontend-scaffolds": "npm run build && node test/fixtures/managed-frontend/verify-scaffolds.mjs",
+    "test:tests-scaffold": "npm run build && node test/fixtures/tests-scaffold/verify.mjs"
   },
   "engines": {
     "node": ">= 22.0.0"