Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/remove-auth-atproto-peer-cycle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"emdash": patch
---

Removes the unnecessary optional `@emdash-cms/auth-atproto` peer dependency so installing EmDash no longer creates a cyclic host/provider dependency.
28 changes: 26 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,30 @@ jobs:
node-version: 22
cache: pnpm
- run: pnpm install --frozen-lockfile
- name: Restore Vite Task cache
id: vite-task-cache
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: node_modules/.vite/task-cache
# Vite Task fingerprints task inputs; the Actions key only scopes compatible runners.
key: vite-task-${{ runner.os }}-${{ runner.arch }}-${{ github.run_id }}-${{ github.run_attempt }}
restore-keys: |
vite-task-${{ runner.os }}-${{ runner.arch }}-
- run: pnpm build
- run: pnpm typecheck
- run: pnpm run --filter emdash-demo --filter @emdash-cms/demo-cloudflare typecheck
- run: pnpm typecheck:demos:ci
- run: pnpm typecheck:templates
- run: node scripts/typecheck-public-source.mjs
- name: Save Vite Task cache
if: success()
uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: node_modules/.vite/task-cache
key: ${{ steps.vite-task-cache.outputs.cache-primary-key }}

lint:
name: Lint
if: github.repository == 'emdash-cms/emdash'
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
Expand All @@ -53,6 +69,7 @@ jobs:

version-check:
name: Version Check
if: github.repository == 'emdash-cms/emdash'
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
Expand All @@ -66,6 +83,7 @@ jobs:

changeset-validate:
name: Changeset Validation
if: github.repository == 'emdash-cms/emdash'
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
Expand All @@ -91,6 +109,7 @@ jobs:

test:
name: Tests
if: github.repository == 'emdash-cms/emdash'
runs-on: ubuntu-latest
timeout-minutes: 15
services:
Expand Down Expand Up @@ -130,6 +149,7 @@ jobs:

test-smoke:
name: Smoke Tests
if: github.repository == 'emdash-cms/emdash'
runs-on: ubuntu-latest
timeout-minutes: 30
services:
Expand Down Expand Up @@ -162,6 +182,7 @@ jobs:

test-integration:
name: Integration Tests
if: github.repository == 'emdash-cms/emdash'
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
Expand All @@ -179,6 +200,7 @@ jobs:

test-browser:
name: Browser Tests
if: github.repository == 'emdash-cms/emdash'
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
Expand All @@ -203,7 +225,7 @@ jobs:

test-e2e-rollup:
name: E2E Tests
if: always()
if: always() && github.repository == 'emdash-cms/emdash'
needs: [test-e2e]
runs-on: ubuntu-latest
timeout-minutes: 5
Expand All @@ -217,6 +239,7 @@ jobs:

test-e2e:
name: E2E tests (${{ matrix.shardIndex }}/${{ matrix.shardTotal }})
if: github.repository == 'emdash-cms/emdash'
runs-on: ubuntu-latest
timeout-minutes: 20
strategy:
Expand Down Expand Up @@ -254,6 +277,7 @@ jobs:

test-e2e-cloudflare:
name: E2E Cloudflare (${{ matrix.shardIndex }}/${{ matrix.shardTotal }})
if: github.repository == 'emdash-cms/emdash'
runs-on: ubuntu-latest
timeout-minutes: 25
strategy:
Expand Down
2 changes: 1 addition & 1 deletion demos/cloudflare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"preview": "astro preview",
"deploy": "pnpm build:all && wrangler deploy",
"db:reset:remote": "./scripts/reset-db.sh",
"typecheck": "astro check"
"typecheck": "astro sync && astro check --noSync"
},
"dependencies": {
"@astrojs/cloudflare": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion demos/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "astro build",
"preview": "astro preview",
"deploy": "wrangler deploy",
"typecheck": "astro check"
"typecheck": "astro sync && astro check --noSync"
},
"dependencies": {
"@astrojs/cloudflare": "catalog:",
Expand Down
4 changes: 2 additions & 2 deletions demos/plugins-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "astro build",
"preview": "astro preview",
"start": "node ./dist/server/entry.mjs",
"typecheck": "astro check"
"typecheck": "astro sync && astro check --noSync"
},
"dependencies": {
"@astrojs/node": "catalog:",
Expand All @@ -29,4 +29,4 @@
"devDependencies": {
"@types/node": "catalog:"
}
}
}
2 changes: 1 addition & 1 deletion demos/postgres/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "astro build",
"preview": "astro preview",
"start": "node ./dist/server/entry.mjs",
"typecheck": "astro check"
"typecheck": "astro sync && astro check --noSync"
},
"dependencies": {
"@astrojs/node": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion demos/preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build:all": "pnpm run --filter @emdash-cms/demo-preview... build",
"preview": "astro preview",
"deploy": "pnpm build:all && wrangler deploy",
"typecheck": "astro check"
"typecheck": "astro sync && astro check --noSync"
},
"dependencies": {
"@astrojs/cloudflare": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion demos/simple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"build": "astro build",
"preview": "astro preview",
"start": "node ./dist/server/entry.mjs",
"typecheck": "astro check"
"typecheck": "astro sync && astro check --noSync"
},
"dependencies": {
"@astrojs/node": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion fixtures/perf-site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dev": "astro dev",
"build": "astro build",
"bootstrap": "emdash init && emdash seed",
"typecheck": "astro check"
"typecheck": "astro sync && astro check --noSync"
},
"dependencies": {
"@astrojs/cloudflare": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion infra/blog-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "astro build",
"preview": "astro preview",
"deploy": "astro build && wrangler deploy",
"typecheck": "astro check",
"typecheck": "astro sync && astro check --noSync",
"bootstrap": "emdash init && emdash seed",
"seed": "emdash seed"
},
Expand Down
2 changes: 1 addition & 1 deletion infra/cache-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "astro build",
"preview": "astro preview",
"deploy": "astro build && wrangler deploy",
"typecheck": "astro check",
"typecheck": "astro sync && astro check --noSync",
"bootstrap": "emdash init && emdash seed",
"seed": "emdash seed"
},
Expand Down
2 changes: 1 addition & 1 deletion infra/do-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "astro build",
"preview": "astro preview",
"deploy": "astro build && wrangler deploy",
"typecheck": "astro check",
"typecheck": "astro sync && astro check --noSync",
"bootstrap": "emdash init && emdash seed",
"seed": "emdash seed"
},
Expand Down
2 changes: 1 addition & 1 deletion infra/do-solo-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "astro build",
"preview": "astro preview",
"deploy": "astro build && wrangler deploy",
"typecheck": "astro check",
"typecheck": "astro sync && astro check --noSync",
"bootstrap": "emdash init && emdash seed",
"seed": "emdash seed"
},
Expand Down
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
"version": "1.0.0",
"description": "Agent-portable reimplementation of WordPress on Astro",
"scripts": {
"typecheck": "pnpm run --filter {./packages/**} typecheck",
"typecheck:demos": "pnpm run --workspace-concurrency=1 --filter {./demos/*} --filter !@emdash-cms/demo-cloudflare typecheck",
"typecheck:templates": "pnpm run --workspace-concurrency=1 --filter {./templates/*} typecheck",
"typecheck": "vp run --cache --concurrency-limit=4 --filter {./packages/**} typecheck",
"typecheck:demos": "vp run --cache --concurrency-limit=1 --filter {./demos/*} --filter !@emdash-cms/demo-cloudflare typecheck",
"typecheck:demos:ci": "vp run --cache --filter emdash-demo --filter @emdash-cms/demo-cloudflare typecheck",
"typecheck:templates": "vp run --cache --concurrency-limit=1 --filter {./templates/*} typecheck",
"check": "pnpm run typecheck && pnpm run --filter {./packages/*} check",
"test": "pnpm run --filter {./packages/*} test",
"test:unit": "pnpm run --filter emdash --filter @emdash-cms/auth --filter @emdash-cms/blocks --filter @emdash-cms/gutenberg-to-portable-text --filter @emdash-cms/marketplace --filter @emdash-cms/plugin-cli --filter @emdash-cms/plugin-forms --filter @emdash-cms/plugin-types --filter @emdash-cms/registry-client --filter @emdash-cms/registry-lexicons test",
Expand Down Expand Up @@ -50,7 +51,8 @@
"pkg-pr-new": "^0.0.75",
"prettier": "^3.9.1",
"prettier-plugin-astro": "^0.14.1",
"typescript": "6.0.0-beta"
"typescript": "6.0.0-beta",
"vite-plus": "^0.2.4"
},
"packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
"engines": {
Expand Down
6 changes: 0 additions & 6 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -257,16 +257,10 @@
},
"peerDependencies": {
"@astrojs/react": ">=5.0.0-beta.0",
"@emdash-cms/auth-atproto": "workspace:>=0.2.8",
"astro": ">=6.0.0-beta.0",
"react": ">=18.0.0",
"react-dom": ">=18.0.0"
},
"peerDependenciesMeta": {
"@emdash-cms/auth-atproto": {
"optional": true
}
},
"devDependencies": {
"@apidevtools/swagger-parser": "^12.1.0",
"@arethetypeswrong/cli": "catalog:",
Expand Down
Loading
Loading