Skip to content

Commit 51ec748

Browse files
committed
fixup!
1 parent 93e829e commit 51ec748

6 files changed

Lines changed: 20 additions & 14 deletions

File tree

‎.github/workflows/playwright-cloudflare-open-next.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ jobs:
5050
working-directory: apps/site
5151
run: node_modules/.bin/playwright install --with-deps
5252

53-
- name: Build OpenNext worker
54-
run: pnpm --filter=@node-core/platform-cloudflare build:worker
53+
- name: Build open-next site
54+
run: node_modules/.bin/turbo build --filter=@node-core/platform-cloudflare --cache-dir=.turbo/cache
5555

5656
- name: Run Playwright tests
5757
run: pnpm --filter=@node-core/platform-cloudflare test:e2e

‎.github/workflows/tmp-cloudflare-open-next-deploy.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,11 @@ jobs:
5252
- name: Install packages
5353
run: pnpm install --frozen-lockfile
5454

55-
- name: Build blog data
56-
working-directory: apps/site
57-
run: node --run build:blog-data
58-
5955
- name: Build open-next site
60-
run: pnpm --filter=@node-core/platform-cloudflare build:worker
56+
run: node_modules/.bin/turbo build --filter=@node-core/platform-cloudflare --cache-dir=.turbo/cache
6157

6258
- name: Deploy open-next site
63-
run: pnpm --filter=@node-core/platform-cloudflare deploy:worker
59+
run: pnpm --filter=@node-core/platform-cloudflare deploy
6460
env:
6561
CF_WORKERS_SCRIPTS_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
6662
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}

‎apps/site/turbo.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
"cache": false
110110
},
111111
"lint:types": {
112+
"dependsOn": ["build:blog-data"],
112113
"cache": false
113114
},
114115
"format": {

‎docs/cloudflare-build-and-deployment.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,6 @@ For more details, refer to the [Sentry Cloudflare guide](https://docs.sentry.io/
7777

7878
Building, previewing, and deploying the website targeting the Cloudflare network is implemented via the following commands (all part of the [`@node-core/platform-cloudflare`](../platforms/cloudflare/package.json) package):
7979

80-
- `pnpm --filter=@node-core/platform-cloudflare build:worker` builds the website using the OpenNext Cloudflare adapter
80+
- `pnpm --filter=@node-core/platform-cloudflare build` builds the website using the OpenNext Cloudflare adapter
8181
- `pnpm --filter=@node-core/platform-cloudflare preview` runs a previously built worker locally in a server simulating the Cloudflare hosting (using the [Wrangler CLI](https://developers.cloudflare.com/workers/wrangler/))
82-
- `pnpm --filter=@node-core/platform-cloudflare deploy:worker` builds the website using the OpenNext Cloudflare adapter and deploys it to the Cloudflare network (using the [Wrangler CLI](https://developers.cloudflare.com/workers/wrangler/))
82+
- `pnpm --filter=@node-core/platform-cloudflare deploy` builds the website using the OpenNext Cloudflare adapter and deploys it to the Cloudflare network (using the [Wrangler CLI](https://developers.cloudflare.com/workers/wrangler/))

‎platforms/cloudflare/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"directory": "platforms/cloudflare"
99
},
1010
"scripts": {
11-
"prebuild:worker": "node ./scripts/twoslash-fsmap/index.mjs",
12-
"build:worker": "cross-env NODE_OPTIONS=--conditions=cloudflare pnpm --filter=@node-core/website exec opennextjs-cloudflare build --openNextConfigPath ../../platforms/cloudflare/open-next.config.ts --config ../../platforms/cloudflare/wrangler.jsonc",
13-
"predeploy:worker": "node ./scripts/twoslash-fsmap/index.mjs",
14-
"deploy:worker": "cross-env NODE_OPTIONS=--conditions=cloudflare pnpm --filter=@node-core/website exec opennextjs-cloudflare deploy --openNextConfigPath ../../platforms/cloudflare/open-next.config.ts --config ../../platforms/cloudflare/wrangler.jsonc",
11+
"prebuild": "node ./scripts/twoslash-fsmap/index.mjs",
12+
"build": "cross-env NODE_OPTIONS=--conditions=cloudflare pnpm --filter=@node-core/website exec opennextjs-cloudflare build --openNextConfigPath ../../platforms/cloudflare/open-next.config.ts --config ../../platforms/cloudflare/wrangler.jsonc",
13+
"predeploy": "node ./scripts/twoslash-fsmap/index.mjs",
14+
"deploy": "cross-env NODE_OPTIONS=--conditions=cloudflare pnpm --filter=@node-core/website exec opennextjs-cloudflare deploy --openNextConfigPath ../../platforms/cloudflare/open-next.config.ts --config ../../platforms/cloudflare/wrangler.jsonc",
1515
"preview": "pnpm --filter=@node-core/website exec wrangler dev --config ../../platforms/cloudflare/wrangler.jsonc",
1616
"test:e2e": "cross-env NODE_OPTIONS=--conditions=cloudflare pnpm --filter=@node-core/website playwright",
1717
"lint:types": "tsc --noEmit"

‎platforms/cloudflare/turbo.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
"$schema": "https://turbo.build/schema.json",
33
"extends": ["//"],
44
"tasks": {
5+
"build": {
6+
"dependsOn": [
7+
"@node-core/website#build:blog-data",
8+
"@node-core/rehype-shiki#build",
9+
"@node-core/remark-lint#build",
10+
"@node-core/ui-components#build",
11+
"@node-core/website-i18n#build"
12+
]
13+
},
514
"lint:types": {
615
"cache": false
716
}

0 commit comments

Comments
 (0)