@loopress/cli 0.26.0 → 0.28.0

package/dist/commands/app/pull.js

@@ -2,9 +2,9 @@ import { confirm } from '@inquirer/prompts';
 import { Args } from '@oclif/core';
 import { Buffer } from 'node:buffer';
 import { existsSync } from 'node:fs';
-import { mkdir, readdir, rm, writeFile } from 'node:fs/promises';
+import { mkdir, readdir, readFile, rm, writeFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
-import { APP_CONFIG_FILENAME } from '../../lib/app-manifest.js';
+import { APP_CONFIG_FILENAME, parseAppConfig } from '../../lib/app-manifest.js';
 import { LoopressCommand } from '../../lib/base.js';
 import { isInteractive } from '../../lib/interactive.js';
 import { pluralize } from '../../utils/pluralize.js';
@@ -60,14 +60,27 @@ export default class Pull extends LoopressCommand {
     }
     async pullApp(path, name) {
         const manifest = await this.wp.get(`loopress/v1/apps/${name}/manifest`);
-        const distDir = join(path, name, 'dist');
+        const appDir = join(path, name);
+        const configPath = join(appDir, APP_CONFIG_FILENAME);
+        // WordPress doesn't know where the app builds to (assetsDir) or whether its entry is explicit:
+        // keep what the local config says, only refresh what the server is the source of truth for.
+        const local = existsSync(configPath) ? parseAppConfig(await readFile(configPath, 'utf8'), appDir) : {};
+        const assetsDir = local.assetsDir ?? 'dist';
+        const distDir = join(appDir, assetsDir);
         for (const file of manifest.files) {
             const { content } = await this.wp.get(`loopress/v1/apps/${name}/asset?path=${encodeURIComponent(file.path)}`);
             const target = join(distDir, file.path);
             await mkdir(dirname(target), { recursive: true });
             await writeFile(target, Buffer.from(content, 'base64'));
         }
-        await writeFile(join(path, name, APP_CONFIG_FILENAME), JSON.stringify({ assetsDir: 'dist', mountSelector: manifest.mountSelector, name: manifest.name, routing: manifest.routing }, null, 2) + '\n');
+        await writeFile(configPath, JSON.stringify({
+            ...local,
+            assetsDir,
+            crossOrigin: manifest.crossOrigin ?? undefined, // dropped by JSON.stringify when unset
+            mountSelector: manifest.mountSelector,
+            name: manifest.name,
+            routing: manifest.routing,
+        }, null, 2) + '\n');
         this.log(`  ${name}: ${pluralize(manifest.files.length, 'file')} (build ${manifest.buildId})`);
         return { files: manifest.files.length, name };
     }

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

@@ -18,11 +18,14 @@ export default class Push extends PushCommand {
     static flags: {
         yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        build: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
+    private build;
     run(): Promise<PushResult>;
     private appDirNames;
     private pushApp;
     private remoteFiles;
     private uploadAsset;
+    private warnIfCrossOriginIgnored;
 }
 export {};

package/dist/commands/app/push.js

@@ -1,7 +1,8 @@
-import { Args } from '@oclif/core';
+import { Args, Flags } from '@oclif/core';
 import { existsSync } from 'node:fs';
 import { readdir, readFile } from 'node:fs/promises';
 import { join } from 'node:path';
+import { buildApp } from '../../lib/app-build.js';
 import { APP_CONFIG_FILENAME, diffFiles, loadAppManifest, } from '../../lib/app-manifest.js';
 import { PushCommand } from '../../lib/push-command.js';
 import { isNotFoundError } from '../../lib/wp-client.js';
@@ -10,15 +11,22 @@ export default class Push extends PushCommand {
     static args = {
         name: Args.string({ description: 'Push only this app (defaults to every app in the directory)' }),
     };
-    static description = 'Push built single-page app bundles to WordPress. Each app is an `apps/<name>/` directory holding a loopress.app.json and a built dist/ folder. Only files whose content changed are uploaded.';
+    static description = 'Build and push single-page app bundles to WordPress. Each app is an `apps/<name>/` directory holding a loopress.app.json and a dist/ folder. When the app has a package.json with a `build` script, it runs first (use --no-build to skip it). Only files whose content changed are uploaded.';
     static enableJsonFlag = true;
-    static examples = ['$ lps app push', '$ lps app push search'];
+    static examples = ['$ lps app push', '$ lps app push search', '$ lps app push --no-build'];
     static flags = {
+        build: Flags.boolean({
+            allowNo: true,
+            default: true,
+            description: "Run the app's package.json build script before pushing",
+        }),
         ...PushCommand.dryRunFlag,
         ...PushCommand.yesFlag,
     };
+    build = true;
     async run() {
-        const { args } = await this.parse(Push);
+        const { args, flags } = await this.parse(Push);
+        this.build = flags.build;
         const { url } = this.siteConfig;
         const path = this.resolveAppsPath();
         this.log(`Pushing apps to ${url}`);
@@ -71,6 +79,13 @@ export default class Push extends PushCommand {
         let manifest;
         let distDir;
         try {
+            // Built on dry runs too: the preview diffs dist/, so a stale one would make it lie.
+            if (this.build) {
+                await buildApp(appDir, (command) => {
+                    if (task)
+                        task.output = `${dirName}: building (${command})`;
+                });
+            }
             ;
             ({ distDir, manifest } = await loadAppManifest(appDir, dirName));
         }
@@ -93,12 +108,14 @@ export default class Push extends PushCommand {
                 task.output = `${manifest.name}: uploading ${file.path} (${index + 1}/${changed.length})`;
             await this.uploadAsset(manifest.name, distDir, file);
         }
+        let committed;
         try {
-            await this.wp.post(`loopress/v1/apps/${manifest.name}/commit`, manifest);
+            committed = await this.wp.post(`loopress/v1/apps/${manifest.name}/commit`, manifest);
         }
         catch (error) {
             this.reportTaskFailure(`${manifest.name}: commit failed: ${error.message}`, error, task);
         }
+        this.warnIfCrossOriginIgnored(manifest, committed);
         if (task) {
             task.output =
                 changed.length === 0
@@ -127,4 +144,11 @@ export default class Push extends PushCommand {
             this.reportTaskFailure(`${name}: failed to upload ${file.path}: ${error.message}`, error);
         }
     }
+    // An older plugin, or an app .htaccess the site owner manages, commits the build without the
+    // policy: say so rather than let the app look protected when it is not.
+    warnIfCrossOriginIgnored(manifest, committed) {
+        if (manifest.crossOrigin && committed?.crossOrigin !== manifest.crossOrigin) {
+            this.warn(`${manifest.name}: crossOrigin "${manifest.crossOrigin}" was not applied: either the Loopress plugin on this site is too old (update it, then push again) or wp-content/loopress/apps/${manifest.name}/.htaccess is managed by hand and was left untouched.`);
+        }
+    }
 }

package/dist/commands/composer/push.js

@@ -4,26 +4,8 @@ import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { PushCommand } from '../../lib/push-command.js';
 import { isTimeoutError } from '../../lib/wp-client.js';
+import { toIntent } from '../../utils/composer.js';
 import { parseCollisions, SYNC_TIMEOUT_MS, } from '../../utils/plugin-sync.js';
-// Split a composer.json `require` map into the three intent namespaces the sync endpoint
-// understands. `composer/installers` is owned by the server scaffold, never sent.
-function toIntent(require) {
-    const intent = { libraries: {}, plugins: {}, themes: {} };
-    for (const [name, constraint] of Object.entries(require)) {
-        if (name === 'composer/installers')
-            continue;
-        if (name.startsWith('wpackagist-plugin/')) {
-            intent.plugins[name.slice('wpackagist-plugin/'.length)] = constraint;
-        }
-        else if (name.startsWith('wpackagist-theme/')) {
-            intent.themes[name.slice('wpackagist-theme/'.length)] = constraint;
-        }
-        else {
-            intent.libraries[name] = constraint;
-        }
-    }
-    return intent;
-}
 export default class ComposerPush extends PushCommand {
     static description = 'Push composer.json to WordPress and run Composer to resolve and install dependencies';
     static enableJsonFlag = true;

package/dist/commands/diff.js

@@ -7,7 +7,7 @@ const RESOURCES = [...RESOURCE_STATE_PROVIDERS.map((provider) => provider.resour
 export default class Diff extends DiffCommand {
     static description = [
         'Show what differs between your local tracked files and a WordPress environment, or between two environments.',
-        'Covers snippets, forms, ACF, API routes, Hooks, pages, SEO, Options, Menus, Theme styles, and Composer. Plugins and themes have their own `lps plugin status` / `lps theme status`.',
+        'Covers snippets, forms, ACF, API routes, Hooks, templates, template parts, pages, SEO, Options, Menus, Theme styles, and Composer. Plugins and themes have their own `lps plugin status` / `lps theme status`.',
         'Exit code: 0 in sync, 1 on drift, 2 when a resource could not be compared, so it doubles as a CI drift gate.',
     ].join(' ');
     static enableJsonFlag = true;

package/dist/commands/init.js

@@ -4,7 +4,7 @@ import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { configManager } from '../config/project-config.manager.js';
 import { isInteractive } from '../lib/interactive.js';
-import { writeLocalConfig } from '../utils/loopress-config.js';
+import { ensureLfGitattributes, writeLocalConfig } from '../utils/loopress-config.js';
 // WordPress.org slugs for the two snippet plugins the Loopress WordPress plugin supports
 // (see SnippetModule.php, which wires up both providers and auto-detects the active one).
 const SNIPPET_PROVIDERS = [
@@ -21,6 +21,8 @@ const FEATURES = [
     { dir: 'hooks', key: 'hooksDir', label: 'Hooks (actions, filters, cron)' },
     { dir: 'apps', key: 'appsDir', label: 'Single-page apps' },
     { dir: 'pages', key: 'pageDir', label: 'Static pages' },
+    { dir: 'templates', key: 'templateDir', label: 'Block templates' },
+    { dir: 'parts', key: 'partDir', label: 'Block template parts' },
 ];
 export default class Init extends Command {
     static description = 'Initialize a loopress.json config file in the current directory';
@@ -68,6 +70,7 @@ export default class Init extends Command {
                 config[feature.key] = feature.dir;
         }
         await writeLocalConfig(config);
+        const isGitattributesUpdated = await ensureLfGitattributes();
         let isProviderAdded = false;
         if (providerChoice !== '__none__') {
             try {
@@ -89,6 +92,9 @@ export default class Init extends Command {
         if (isProviderAdded) {
             this.log(`  Plugin:   ${providerChoice}`);
         }
+        if (isGitattributesUpdated) {
+            this.log('✓ .gitattributes: LF line endings, so files match across macOS, Linux and Windows');
+        }
         this.log('\n→ Next: run `lps snippet pull` to fetch what is already on the site, or `lps doctor` to verify the connection.');
     }
     // When nothing is configured yet, the useful path is configuring a project right here, not

package/dist/commands/page/push.js

@@ -1,6 +1,6 @@
 import { Args } from '@oclif/core';
 import { PushCommand } from '../../lib/push-command.js';
-import { formatPageProblems, PAGES_ENDPOINT, readLocalPages } from '../../utils/page-format.js';
+import { formatPageProblems, frontPageNote, PAGES_ENDPOINT, readLocalPages } from '../../utils/page-format.js';
 import { pluralize } from '../../utils/pluralize.js';
 import { resolveResourceDir } from '../../utils/resource-dirs.js';
 export default class Push extends PushCommand {
@@ -51,7 +51,7 @@ export default class Push extends PushCommand {
         try {
             const result = await this.wp.put(PAGES_ENDPOINT, page);
             if (task)
-                task.output = `Pushed: ${page.slug} (${result.status}) ${result.link}`;
+                task.output = `Pushed: ${page.slug} (${result.status}) ${result.link}${frontPageNote(result)}`;
         }
         catch (error) {
             this.reportTaskFailure(`Failed to push ${page.slug}: ${error.message}`, error, task);

package/dist/commands/plugin/add.d.ts

@@ -1,13 +1,20 @@
 import { LoopressCommand } from '../../lib/base.js';
+type AddResult = {
+    slug: string;
+    status: 'added' | 'dry-run' | 'unchanged' | 'updated';
+    version: string;
+};
 export default class Add extends LoopressCommand {
     static args: {
         slug: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static description: string;
+    static enableJsonFlag: boolean;
     static examples: string[];
     static flags: {
         version: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
-    run(): Promise<void>;
+    run(): Promise<AddResult>;
 }
+export {};

package/dist/commands/plugin/add.js

@@ -1,5 +1,6 @@
 import { Args, Flags } from '@oclif/core';
 import { LoopressCommand } from '../../lib/base.js';
+import { pinVersion } from '../../types/plugin.js';
 import { writeLocalConfig } from '../../utils/loopress-config.js';
 import { isExactVersion } from '../../utils/version.js';
 export default class Add extends LoopressCommand {
@@ -7,6 +8,7 @@ export default class Add extends LoopressCommand {
         slug: Args.string({ description: 'Plugin slug on WordPress.org', required: true }),
     };
     static description = 'Add a WordPress.org plugin to loopress.json';
+    static enableJsonFlag = true;
     static examples = [
         '$ lps plugin add woocommerce',
         '$ lps plugin add woocommerce --version 9.4.2',
@@ -24,19 +26,22 @@ export default class Add extends LoopressCommand {
             this.error(`--version must be an exact version like 9.4.2, not a Composer constraint. Got "${version}".`);
         }
         const existing = this.localConfig.plugins ?? {};
-        if (existing[slug] === version) {
+        const current = existing[slug];
+        if (current !== undefined && pinVersion(current) === version) {
             this.log(`${slug} is already pinned to ${version} in loopress.json, nothing to do.`);
-            return;
+            return { slug, status: 'unchanged', version };
         }
-        const isUpdated = existing[slug] !== undefined;
+        const isUpdated = current !== undefined;
         if (this.dryRun) {
             this.log(`[dry-run] Would ${isUpdated ? 'update' : 'add'} ${slug} (${version}) in loopress.json`);
-            return;
+            return { slug, status: 'dry-run', version };
         }
         await writeLocalConfig({
             ...this.localConfig,
-            plugins: { ...existing, [slug]: version },
+            // Re-pinning a plugin recorded as inactive keeps it inactive.
+            plugins: { ...existing, [slug]: typeof current === 'object' ? { ...current, version } : version },
         });
         this.log(`${isUpdated ? 'Updated' : 'Added'} ${slug} (${version}). Run \`lps plugin push\` to apply.`);
+        return { slug, status: isUpdated ? 'updated' : 'added', version };
     }
 }

package/dist/commands/plugin/audit.js

@@ -1,5 +1,6 @@
 import got from 'got';
 import { LoopressCommand } from '../../lib/base.js';
+import { pinVersion } from '../../types/plugin.js';
 import { compareVersions } from '../../utils/version.js';
 const WPVULN_BASE = 'https://www.wpvulnerability.net/plugin';
 const WPORG_INFO = 'https://api.wordpress.org/plugins/info/1.2/';
@@ -18,7 +19,7 @@ export default class Audit extends LoopressCommand {
         const advisories = [];
         const health = [];
         for (const slug of slugs) {
-            const found = await this.auditOne(slug, manifest[slug]);
+            const found = await this.auditOne(slug, pinVersion(manifest[slug]));
             advisories.push(...found.advisories);
             health.push(...found.health);
         }
@@ -26,16 +27,14 @@ export default class Audit extends LoopressCommand {
     }
     async auditOne(slug, pinned) {
         const [vulns, info] = await Promise.all([this.fetchVulnerabilities(slug), this.fetchHealth(slug)]);
-        const advisories = vulns
-            .filter((v) => pinned === 'latest' || affects(pinned, v.fixedIn))
-            .map((v) => ({ ...v, slug }));
+        const advisories = vulns.filter((v) => pinned === 'latest' || affects(pinned, v.fixedIn)).map((v) => ({ ...v, slug }));
         const health = info ? describeHealth(slug, pinned, info) : [];
         return { advisories, health };
     }
     async fetchHealth(slug) {
         try {
             const body = await got(WPORG_INFO, {
-                searchParams: { 'action': 'plugin_information', 'request[slug]': slug },
+                searchParams: { action: 'plugin_information', 'request[slug]': slug },
                 timeout: { request: 10_000 },
             }).json();
             return typeof body === 'object' && !('error' in body) ? body : null;

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

@@ -1,7 +1,9 @@
 import { LoopressCommand } from '../../lib/base.js';
+import { type ComposerPullResult } from '../../utils/composer.js';
 import { type MergeResult } from '../../utils/plugins.js';
 type PullResult = MergeResult & {
-    status: 'composer-managed' | 'dry-run' | 'success';
+    skipped?: ComposerPullResult['skipped'];
+    status: 'dry-run' | 'success';
 };
 export default class Pull extends LoopressCommand {
     static description: string;

package/dist/commands/plugin/pull.js

@@ -1,6 +1,7 @@
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { LoopressCommand } from '../../lib/base.js';
+import { pullIntoComposerJson } from '../../utils/composer.js';
 import { writeLocalConfig } from '../../utils/loopress-config.js';
 import { mergePluginManifest, parseInstalledPlugins } from '../../utils/plugins.js';
 export default class Pull extends LoopressCommand {
@@ -12,18 +13,25 @@ export default class Pull extends LoopressCommand {
     };
     async run() {
         const { url } = this.siteConfig;
-        if (existsSync(join(process.cwd(), this.rootDir, 'composer.json'))) {
-            this.warn('This project has a composer.json, which is authoritative for plugins. Run `lps composer pull` instead.');
-            return { added: [], merged: this.localConfig.plugins ?? {}, status: 'composer-managed', updated: [] };
-        }
         this.log(`Pulling plugins from ${url}`);
         const raw = await this.wp.get('wp/v2/plugins');
         const installed = parseInstalledPlugins(raw);
-        // Pin every plugin to the version actually running on the site. A later `plugin push`
-        // installs exactly this set via Composer + WPackagist; drift only surfaces when the pinned
-        // version and the live version disagree.
-        const incoming = Object.fromEntries(installed.map((p) => [p.slug, p.version]));
-        const { added, merged, updated } = mergePluginManifest(this.localConfig.plugins ?? {}, incoming);
+        // Pin every plugin to the version actually running on the site, and record the inactive ones
+        // as such so a later `plugin push` doesn't switch them on. A later `plugin push` installs
+        // exactly this set via Composer + WPackagist; drift only surfaces when the pinned version and
+        // the live version disagree.
+        const versions = Object.fromEntries(installed.map((p) => [p.slug, p.version]));
+        const pins = Object.fromEntries(installed.map((p) => [p.slug, p.active ? p.version : { active: false, version: p.version }]));
+        // A composer.json is authoritative over loopress.json: pin the live versions there instead.
+        const composerJsonPath = join(process.cwd(), this.rootDir, 'composer.json');
+        if (existsSync(composerJsonPath)) {
+            const result = await pullIntoComposerJson(composerJsonPath, 'plugin', versions, {
+                dryRun: this.dryRun,
+                log: this.log.bind(this),
+            });
+            return { ...result, status: this.dryRun ? 'dry-run' : 'success' };
+        }
+        const { added, merged, updated } = mergePluginManifest(this.localConfig.plugins ?? {}, pins);
         if (this.dryRun) {
             this.log(`[dry-run] Would write ${Object.keys(merged).length} plugins to loopress.json`);
             if (added.length > 0)

package/dist/commands/plugin/push.d.ts

@@ -1,17 +1,19 @@
 import { PushCommand } from '../../lib/push-command.js';
 type PushResult = {
     activated: string[];
+    deactivated: string[];
     installed: string[];
     pinned: string[];
     pruned: string[];
     removed: string[];
-    status: 'composer-managed' | 'dry-run' | 'in-sync' | 'success';
+    status: 'dry-run' | 'in-sync' | 'success';
 };
 export default class Push extends PushCommand {
     static description: string;
     static enableJsonFlag: boolean;
     static examples: string[];
     static flags: {
+        activate: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         prune: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
@@ -24,6 +26,8 @@ export default class Push extends PushCommand {
     private fetchInstanceLock;
     private filesForNewlyInstalled;
     private guardForce;
+    private loadSource;
+    private logStillInactive;
     private result;
     private sync;
 }