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
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ references:
restore_cache:
name: Restore pnpm cache
keys:
- pnpm-cache-v1-{{ checksum "pnpm-lock.yaml" }}
- pnpm-cache-v1
- pnpm-cache-v2-{{ checksum "pnpm-lock.yaml" }}
- pnpm-cache-v2

setup_pnpm: &setup_pnpm
run:
name: Setup pnpm
command: |
npm install --global corepack@latest
corepack enable
corepack prepare pnpm@latest-10 --activate
pnpm config set store-dir ~/.pnpm-store
corepack prepare pnpm@11.0.5 --activate
echo 'export pnpm_config_store_dir="$PWD/.pnpm-store"' >> "$BASH_ENV"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did the store-dir setup change? I didn't see that as a breaking change in their guide: https://pnpm.io/11.x/migration

attach_workspace: &attach_workspace
attach_workspace:
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
- *restore_pnpm_cache
- *pnpm_install
- save_cache:
key: pnpm-cache-v1-{{ checksum "pnpm-lock.yaml" }}
key: pnpm-cache-v2-{{ checksum "pnpm-lock.yaml" }}
paths:
- .pnpm-store
- *persist_to_workspace
Expand Down
2 changes: 0 additions & 2 deletions .npmrc

This file was deleted.

2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ developers to quickly build beautiful and consistent interfaces for our users.
### Prerequisites

- `node@24`
- `pnpm@10`
- `pnpm@11`

To install Atlantis locally for development:

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"private": true,
"name": "atlantis",
"version": "0.0.1",
"packageManager": "pnpm@10.33.0",
"packageManager": "pnpm@11.0.5",
"license": "MIT",
"scripts": {
"bootstrap": "pnpm -r --if-present run bootstrap",
Expand Down Expand Up @@ -120,7 +120,7 @@
],
"engines": {
"node": "24",
"pnpm": "10"
"pnpm": "11"
},
"overrides": {
"react": "19.1.1",
Expand All @@ -138,4 +138,4 @@
}
},
"engineStrict": true
}
}
4 changes: 2 additions & 2 deletions packages/site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@jobber/atlantis-site",
"private": true,
"version": "0.60.0",
"packageManager": "pnpm@10.33.0",
"packageManager": "pnpm@11.0.5",
"type": "module",
"scripts": {
"dev": "pnpm run bundle && pnpm run copyFiles && vite --force",
Expand Down Expand Up @@ -87,4 +87,4 @@
"vfile": "^6.0.3",
"vite": "^5.3.1"
}
}
}
10 changes: 10 additions & 0 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,12 @@
packages:
- "packages/*"
allowBuilds:
'@parcel/watcher': set this to true or false
esbuild: set this to true or false
fsevents: set this to true or false
husky: set this to true or false
nx: set this to true or false

minimumReleaseAge: 7
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This in minutes, so need to convert to 7 days https://pnpm.io/settings#minimumreleaseage

publicHoistPattern:
- run-node
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unclear if we still need this publicHoistPattern. We didn't have it with v10 (unless pnpm read npmrc), so I'm not sure we still need it now.

2 changes: 1 addition & 1 deletion scripts/e2e.runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
corepack enable pnpm

# Configure the pnpm store directory inside the mounted volume so it can be cached
pnpm config set store-dir /pnpm-store
export pnpm_config_store_dir=/pnpm-store

# Install and prepare all dependencies
pnpm install --ignore-scripts
Expand Down
4 changes: 2 additions & 2 deletions scripts/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cd ../..
# If --clean is supplied, delete existing docker volumes
if [[ " $* " == *" --clean "* ]]; then
echo "Cleaning up docker volumes for a fresh install..."
docker volume rm --force atlantis_pnpm_store atlantis_node_modules__root atlantis_node_modules__components_native atlantis_node_modules__components atlantis_node_modules__design atlantis_node_modules__eslint_config atlantis_node_modules__formatters atlantis_node_modules__generators atlantis_node_modules__hooks atlantis_node_modules__site atlantis_node_modules__stylelint_config
docker volume rm --force atlantis_pnpm_store atlantis_pnpm_store_v11 atlantis_node_modules__root atlantis_node_modules__components_native atlantis_node_modules__components atlantis_node_modules__design atlantis_node_modules__eslint_config atlantis_node_modules__formatters atlantis_node_modules__generators atlantis_node_modules__hooks atlantis_node_modules__site atlantis_node_modules__stylelint_config
fi

# NOTES:
Expand All @@ -31,7 +31,7 @@ echo "Running e2e tests inside a docker container..."
# Run the e2e tests
docker run --rm -it \
-v $(pwd):/atlantis \
-v atlantis_pnpm_store:/pnpm-store/v10 \
-v atlantis_pnpm_store_v11:/pnpm-store/v11 \
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, this looks good.

-v atlantis_node_modules__root:/atlantis/node_modules \
-v atlantis_node_modules__components_native:/atlantis/packages/components-native/node_modules \
-v atlantis_node_modules__components:/atlantis/packages/components/node_modules \
Expand Down
Loading