Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
cdb311a
Read site data from CLI instead of appdata (#2701)
bcotrim Mar 11, 2026
9e72f3f
Merge remote-tracking branch 'origin/trunk' into stu-1350-decoupled-c…
bcotrim Mar 12, 2026
8daf4a9
Merge branch 'trunk' into stu-1350-decoupled-config-dev
bcotrim Mar 13, 2026
b2ce79e
Move CLI site data to dedicated config file (#2731)
bcotrim Mar 13, 2026
7748599
Merge remote-tracking branch 'origin/trunk' into stu-1350-decoupled-c…
bcotrim Mar 13, 2026
a87533b
Merge trunk into stu-1350-decoupled-config-dev
bcotrim Mar 13, 2026
b4b6e42
Merge branch 'trunk' into stu-1350-decoupled-config-dev
bcotrim Mar 13, 2026
304a3da
Merge branch 'trunk' into stu-1350-decoupled-config-dev
bcotrim Mar 16, 2026
163b971
Fix AI tools test mocks to use cli-config instead of appdata
bcotrim Mar 16, 2026
147bd6d
Merge trunk and resolve conflicts for cli-config decoupling
bcotrim Mar 17, 2026
ae5be29
Apply decoupled config strategy to preview sites (#2807)
bcotrim Mar 17, 2026
cfa000f
Migrate appdata to ~/.studio/appdata.json with extensible migration f…
bcotrim Mar 17, 2026
9d5ead9
Merge stu-1350-decoupled-config-dev and resolve conflicts
bcotrim Mar 17, 2026
12b98f1
Merge branch 'trunk' into stu-1350-decoupled-config-dev
bcotrim Mar 18, 2026
aeb2e3a
Move appdata migration from CLI to Studio Desktop
bcotrim Mar 18, 2026
1081ea7
Wire auth and locale to shared.json, AI settings to cli.json (#2821)
bcotrim Mar 18, 2026
7a34728
Merge remote-tracking branch 'origin/stu-1350-decoupled-config-dev' i…
bcotrim Mar 18, 2026
a6a3838
Rewrite appdata migration to split into shared.json, cli.json, and ap…
bcotrim Mar 18, 2026
63b8b8e
trigger ci
bcotrim Mar 18, 2026
46b0358
Ensure .studio directory exists before lockfile and fix import order
bcotrim Mar 19, 2026
4dd6080
Fix readFile mock type to return Buffer instead of string
bcotrim Mar 19, 2026
852cdc9
Refactor appdata to store only Desktop-specific state with sites as R…
bcotrim Mar 19, 2026
92d5be2
Address PR feedback: rename to app.json and siteMetadata, use zod par…
bcotrim Mar 19, 2026
29fa739
Fix prettier formatting in user-data test
bcotrim Mar 19, 2026
a317a82
Fix e2e migration by respecting E2E_APP_DATA_PATH in getOldAppdataPath
bcotrim Mar 19, 2026
a1b7c38
Merge trunk and resolve conflicts in _events.ts and user-settings ipc…
bcotrim Mar 19, 2026
6db60dd
Merge remote-tracking branch 'origin/stu-1350-decoupled-config-dev' i…
bcotrim Mar 19, 2026
0bd4c58
new migration interface
bcotrim Mar 20, 2026
f8e9258
studio migrations
bcotrim Mar 20, 2026
aca873d
studio migrations
bcotrim Mar 20, 2026
ef52842
cli migrations
bcotrim Mar 20, 2026
23d18ed
Merge branch 'trunk' into stu-1350-decoupled-config-dev
bcotrim Mar 20, 2026
cea5b56
Rename appdata references, centralize config paths and lockfile const…
bcotrim Mar 20, 2026
f211f3a
Isolate e2e config directory to fix test failures
bcotrim Mar 20, 2026
6e95cb5
Merge branch 'trunk' into stu-1350-decoupled-config-dev
bcotrim Mar 20, 2026
e58b6d4
Merge branch 'stu-1350-decoupled-config-dev' into stu-1350-decoupled-…
bcotrim Mar 20, 2026
ec6f7e1
Move site metadata cleanup to SiteServer, fix typecheck and test fail…
bcotrim Mar 23, 2026
8c18041
HTTPS certificate migration
fredrikekelund Mar 23, 2026
205f8e6
Rename file
fredrikekelund Mar 23, 2026
63523f3
Initial server-files migration implementation
fredrikekelund Mar 23, 2026
9cd3740
Add APP_CONFIG_LOCKFILE_NAME constant and fix test failures
bcotrim Mar 23, 2026
c19fc13
Merge branch 'stu-1350-decoupled-config-dev-v3' into stu-1350-decoupl…
fredrikekelund Mar 23, 2026
5c1a53f
Actually move server-files to CLI management
fredrikekelund Mar 23, 2026
162433e
Fix test
fredrikekelund Mar 23, 2026
9789cb4
Merge branch 'trunk' into stu-1350-decoupled-config-dev-v4
fredrikekelund Mar 23, 2026
94946a0
Fix merge conflict
fredrikekelund Mar 23, 2026
22a1430
Exclude wp-files from app bundle
fredrikekelund Mar 23, 2026
462a336
Load sites from `SiteServer.getAll()`
fredrikekelund Mar 23, 2026
4627cc7
Merge branch 'stu-1350-decoupled-config-dev-v4' into stu-1350-decoupl…
fredrikekelund Mar 23, 2026
08261cb
Merge branch 'trunk' into stu-1350-decoupled-config-dev-v5
fredrikekelund Mar 23, 2026
616da2b
Various fixes
fredrikekelund Mar 23, 2026
2ef7db0
Fix lint
fredrikekelund Mar 23, 2026
1b24fda
Fix
fredrikekelund Mar 23, 2026
ba40eba
Improved `updateServerFiles` error handling
fredrikekelund Mar 24, 2026
3861ec4
Remove fs-extra
fredrikekelund Mar 24, 2026
d595a6b
Abstract GitHub release fetching
fredrikekelund Mar 24, 2026
d24ccdd
Include wp-files in package.json files
fredrikekelund Mar 24, 2026
304a8f7
Fix errors
fredrikekelund Mar 24, 2026
a5e7ada
Remove outdated wp-now migration
fredrikekelund Mar 24, 2026
8f7ab84
Fix tests
fredrikekelund Mar 24, 2026
6aefb01
Fix issues identified by agentic review
fredrikekelund Mar 24, 2026
cc4d92e
Setup server-files in middleware
fredrikekelund Mar 24, 2026
fff2b98
Address issues raised by AI review
fredrikekelund Mar 24, 2026
9fac688
Fix more review issues
fredrikekelund Mar 24, 2026
a9af3d2
Set up and update in parallel
fredrikekelund Mar 24, 2026
a1be4ca
Merge branch 'trunk' into stu-1350-decoupled-config-dev-v5
fredrikekelund Mar 24, 2026
fd72f20
Remove unused code
fredrikekelund Mar 24, 2026
cd23e27
Remove unused import
fredrikekelund Mar 24, 2026
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Ensure .studio directory exists before lockfile and fix import order
  • Loading branch information
bcotrim committed Mar 19, 2026
commit 46b0358f65beddf722a239c3dd67c9110cf3b43e
2 changes: 1 addition & 1 deletion apps/cli/lib/studio-compatibility.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import fs from 'fs';
import path from 'path';
import { __ } from '@wordpress/i18n';
import { getAppdataDirectory } from 'cli/lib/server-files';
import { STUDIO_CLI_HOME } from 'cli/lib/paths';
import { getAppdataDirectory } from 'cli/lib/server-files';
import { LoggerError } from 'cli/logger';

/**
Expand Down
4 changes: 4 additions & 0 deletions apps/studio/src/storage/user-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ export async function saveUserData( data: UserData ): Promise< void > {
const LOCKFILE_PATH = getUserDataLockFilePath();

export async function lockAppdata() {
const dir = nodePath.dirname( LOCKFILE_PATH );
if ( ! fs.existsSync( dir ) ) {
fs.mkdirSync( dir, { recursive: true } );
}
return lockFileAsync( LOCKFILE_PATH, { stale: LOCKFILE_STALE_TIME, wait: LOCKFILE_WAIT_TIME } );
}

Expand Down