Skip to content

Commit 1959776

Browse files
authored
Merge pull request #1469 from ethereum-optimism/check-pnpm
testing
2 parents efbbe18 + 9aeefea commit 1959776

File tree

5 files changed

+24
-9
lines changed

5 files changed

+24
-9
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ commands:
4444
command: pnpm setup # Run setup to configure the global bin directory
4545
- run:
4646
name: Install dependencies
47-
command: npm install -g pnpm && pnpm install
47+
command: npm install -g pnpm && pnpm install --no-frozen-lockfile
4848
- save_cache:
4949
key: v1-pnpm-cache-{{ checksum "pnpm-lock.yaml" }}
5050
paths:

.husky/pre-push

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1-
#!/usr/bin/env sh
2-
. "$(dirname -- "$0")/_/husky.sh"
3-
41
echo "🔍 Running automatic fixes before pushing..."
5-
pnpm fix
2+
3+
# Try multiple ways to run pnpm
4+
if command -v pnpm >/dev/null 2>&1; then
5+
# Direct pnpm if available in PATH
6+
pnpm fix
7+
elif [ -f "$(npm root -g)/pnpm/bin/pnpm.cjs" ]; then
8+
# Try global NPM installation path
9+
"$(npm root -g)/pnpm/bin/pnpm.cjs" fix
10+
elif command -v npx >/dev/null 2>&1; then
11+
# Fallback to npx if available
12+
npx --no-install pnpm fix
13+
else
14+
echo "⚠️ Could not find pnpm. Skipping automatic fixes..."
15+
exit 0 # Don't fail the push, just continue
16+
fi
617

718
# Check if there are any changes after running fixes
819
if [ -n "$(git status --porcelain)" ]; then

netlify.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
[build]
2+
command = "pnpm install --no-frozen-lockfile && pnpm build"
3+
publish = ".next"
4+
15
[build.environment]
2-
PNPM_VERSION = "10.2.0"
3-
NODE_VERSION = "20.11.0"
6+
NODE_VERSION = "20.11.0"
7+
NPM_FLAGS = "--no-frozen-lockfile"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"lint": "eslint . --ext mdx --max-warnings 0 && pnpm spellcheck:lint && pnpm check-breadcrumbs && pnpm check-redirects && pnpm validate-metadata && pnpm link-checker",
8-
"fix": "eslint . --ext mdx --fix && pnpm spellcheck:fix && pnpm breadcrumbs && pnpm fix-redirects && pnpm metadata-batch-cli && pnpm fix-links",
8+
"fix": "eslint . --ext mdx --fix && pnpm spellcheck:fix && pnpm fix-redirects && pnpm metadata-batch-cli && pnpm fix-links",
99
"spellcheck:lint": "cspell lint \"**/*.mdx\"",
1010
"prepare": "husky",
1111
"spellcheck:fix": "cspell --words-only --unique \"**/*.mdx\" | sort --ignore-case | uniq > words.txt",

pages/app-developers/transactions/estimates.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ It's important to properly estimate the cost of a transaction on OP Mainnet befo
2525
Here you'll learn how to estimate both of the components that make up the total cost of an OP Mainnet transaction, the [execution gas fee](./fees#execution-gas-fee) and the [L1 data fee](./fees#l1-data-fee).
2626
Make sure to read the guide on [Transaction Fees on OP Mainnet](./fees) for a detailed look at how these fees work under the hood.
2727

28-
## Execution gas fee
28+
## Execution gas fee
2929

3030
<Callout type="info">
3131
Estimating the execution gas fee on OP Mainnet is just like estimating the execution gas fee on Ethereum.

0 commit comments

Comments
 (0)