Skip to content

Commit 8459dc0

Browse files
committed
Merge remote-tracking branch 'origin/main' into commercial/ab-testing-poc
2 parents 43bef8e + 8b4941c commit 8459dc0

File tree

89 files changed

+2609
-2525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+2609
-2525
lines changed

.github/workflows/compress.yml

Lines changed: 0 additions & 52 deletions
This file was deleted.

.github/workflows/playwright.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ jobs:
2626
- name: Set up Node environment
2727
uses: ./.github/actions/setup-node-env
2828

29+
- name: Turn off mandb updates
30+
run: |
31+
sudo mv /usr/bin/mandb /usr/bin/mandb-OFF
32+
sudo cp -p /bin/true /usr/bin/mandb
33+
2934
- name: Install Playwright Browsers
3035
run: pnpm playwright install --with-deps chromium
3136
working-directory: ./dotcom-rendering

README.md

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,11 @@
1-
# Dotcom/Apps Rendering
1+
# Dotcom Rendering & Apps Rendering
22

3-
This repository contains the rendering logic for articles on theguardian.com. It is a monorepo with 2 projects, `apps-rendering` and `dotcom-rendering`.
3+
This repository contains the rendering logic for theguardian.com and for a subset of articles in the live apps.
44

5-
## Developer setup
6-
7-
Install [Node.js](https://nodejs.org).
8-
9-
We recommend using [fnm](https://github.com/Schniz/fnm). It is great at managing multiple versions of Node.js on one machine.
10-
11-
> You may find it useful to add `--version-file-strategy recursive` to the [`fnm` shell setup](https://github.com/Schniz/fnm?tab=readme-ov-file#shell-setup). This will set the active Node version to first version it finds in the current directory _or_ any parent directory.
12-
13-
Once Node is installed, make sure you're using the correct package manager by [enabling corepack](https://github.com/nodejs/corepack?tab=readme-ov-file#utility-commands):
14-
15-
```sh
16-
corepack enable
17-
```
18-
19-
> [!NOTE]
20-
>
21-
> If you're using `asdf`, you'll need to run `asdf reshim nodejs` after running `corepack enable`.
22-
23-
## Install
24-
25-
Run `pnpm install` in the root directory of this project to install packages.
5+
It is a monorepo with 2 projects, `apps-rendering` and `dotcom-rendering`.
266

277
## Run
288

29-
You should always `cd` into the correct subdirectory before running commands (e.g `make dev` for dotcom-rendering, or `pnpm watch` for apps-rendering) except for storybook.
30-
319
### `apps rendering`
3210

3311
Go to [apps rendering](apps-rendering/README.md) for more details.
@@ -38,15 +16,9 @@ Go to [dotcom rendering](dotcom-rendering/README.md) for more details.
3816

3917
## Root actions
4018

41-
Most commands are run from within each project but the following are managed from the monorepo root:
19+
Most commands are run from within each project but the following can be run from the root:
4220

43-
### Storybook/Chromatic
21+
### Storybook
4422

4523
`pnpm storybook` - Runs Storybook for all projects
4624
`pnpm build-storybook` - Builds Storybook for all projects
47-
48-
Chromatic now runs at project level. `cd` into the project dir and run `pnpm chromatic -t [CHROMATIC PROJECT TOKEN]`
49-
50-
You can find the token in the project Chromatic instance.
51-
52-
To run Chromatic in CI on your pr, add the `run_chromatic` label once you're ready to check for visual regressions.

0 commit comments

Comments
 (0)