Skip to content

Commit ace4df7

Browse files
authored
chore: harden pnpm installs (#347)
* chore: harden pnpm installs * chore: pin pnpm version in workflows * chore: fix pnpm audit findings * chore: fix pnpm audit findings * chore: harden pnpm configuration * chore: move pnpm config to workspace * fix: include pnpm workspace config in docker build
1 parent 4328f08 commit ace4df7

7 files changed

Lines changed: 169 additions & 580 deletions

File tree

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
!hardhat.config.ts
44
!package.json
55
!pnpm-lock.yaml
6+
!pnpm-workspace.yaml
67
!contracts
78
!scripts
89
!deployment/localhost

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ deployments/**/solcinputs
2727
# OpenZeppelin upgradeable files
2828
.openzeppelin/unknown-*.json
2929
/flatten
30+
31+
.pnpm-store/

.npmrc

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

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ RUN mkdir -p /opt
1717
WORKDIR /opt
1818
COPY package.json .
1919
COPY pnpm-lock.yaml .
20-
RUN corepack enable
20+
COPY pnpm-workspace.yaml .
21+
RUN corepack enable && corepack prepare pnpm@10.33.0 --activate
2122
# Workaround for an issue with package manager and git
2223
RUN git config --global url."https://github.com/".insteadOf ssh://git@github.com/ && \
2324
git config --global url."https://".insteadOf git://

package.json

Lines changed: 2 additions & 171 deletions
Original file line numberDiff line numberDiff line change
@@ -80,180 +80,11 @@
8080
"url": "https://github.com/OlympusDAO/olympus-contracts/issues"
8181
},
8282
"homepage": "https://github.com/OlympusDAO/olympus-contracts#readme",
83-
"packageManager": "pnpm@10.33.0",
8483
"engines": {
8584
"node": ">=22",
86-
"pnpm": "10.33.0",
85+
"pnpm": ">=10.33.0",
8786
"npm": "use-pnpm",
8887
"yarn": "use-pnpm"
8988
},
90-
"pnpm": {
91-
"overrides": {
92-
"ajv": "^8.18.0",
93-
"ajv@<6.14.0": "^6.14.0",
94-
"ajv@>=7.0.0-alpha.0 <8.18.0": "^8.18.0",
95-
"ansi-regex": "^4.1.1",
96-
"ansi-regex@>=3.0.0 <3.0.1": "^3.0.1",
97-
"ansi-regex@>=4.0.0 <4.1.1": "^4.1.1",
98-
"async": "^2.6.4",
99-
"async@>=2.0.0 <2.6.4": "^2.6.4",
100-
"axios": "^1.15.0",
101-
"axios@<0.30.0": "^1.15.0",
102-
"axios@<=0.30.2": "^1.15.0",
103-
"axios@>=0.8.1 <0.28.0": "^1.15.0",
104-
"babel-traverse": "6.26.0",
105-
"base-x": "^3.0.11",
106-
"base-x@<=3.0.10": "^3.0.11",
107-
"bn.js": "^5.2.3",
108-
"bn.js@<4.12.3": "^4.12.3",
109-
"bn.js@>=5.0.0 <5.2.3": "^5.2.3",
110-
"body-parser": "^1.20.3",
111-
"body-parser@<1.20.3": "^1.20.3",
112-
"brace-expansion": "^2.0.3",
113-
"brace-expansion@<1.1.13": "^1.1.13",
114-
"brace-expansion@>=1.0.0 <=1.1.11": "^1.1.12",
115-
"brace-expansion@>=2.0.0 <2.0.3": "^2.0.3",
116-
"brace-expansion@>=2.0.0 <=2.0.1": "^2.0.2",
117-
"braces": "^3.0.3",
118-
"braces@<3.0.3": "^3.0.3",
119-
"browserify-sign": "^4.2.2",
120-
"browserify-sign@>=2.6.0 <=4.2.1": "^4.2.2",
121-
"cipher-base": "^1.0.5",
122-
"cipher-base@<=1.0.4": "^1.0.5",
123-
"cookie@<0.7.0": "^0.7.0",
124-
"cookiejar": "^2.1.4",
125-
"cookiejar@<2.1.4": "^2.1.4",
126-
"cross-spawn": "^7.0.5",
127-
"cross-spawn@<6.0.6": "^6.0.6",
128-
"cross-spawn@>=7.0.0 <7.0.5": "^7.0.5",
129-
"debug@>=3.2.0 <3.2.7": "^3.2.7",
130-
"decode-uri-component": "^0.2.1",
131-
"decode-uri-component@<0.2.1": "^0.2.1",
132-
"diff": "5.2.2",
133-
"diff@<3.5.1": "^3.5.1",
134-
"diff@>=4.0.0 <4.0.4": "^4.0.4",
135-
"diff@>=5.0.0 <5.2.2": "^5.2.2",
136-
"elliptic": "^6.6.1",
137-
"elliptic@<6.5.6": "^6.5.6",
138-
"elliptic@<6.6.0": "^6.6.0",
139-
"elliptic@<=6.6.0": "^6.6.1",
140-
"elliptic@>=2.0.0 <=6.5.6": "^6.5.7",
141-
"elliptic@>=4.0.0 <=6.5.6": "^6.5.7",
142-
"elliptic@>=5.2.1 <=6.5.6": "^6.5.7",
143-
"es5-ext@>=0.10.0 <0.10.63": "^0.10.63",
144-
"express": "^4.19.2",
145-
"express@<4.19.2": "^4.19.2",
146-
"express@<4.20.0": "^4.20.0",
147-
"flatted": "^3.4.2",
148-
"flatted@<3.4.0": "^3.4.0",
149-
"flatted@<=3.4.1": "^3.4.2",
150-
"follow-redirects": "^1.16.0",
151-
"follow-redirects@<1.14.7": "^1.14.7",
152-
"follow-redirects@<1.14.8": "^1.14.8",
153-
"follow-redirects@<1.15.4": "^1.16.0",
154-
"follow-redirects@<=1.15.5": "^1.16.0",
155-
"form-data": "^4.0.4",
156-
"form-data@<2.5.4": "^2.5.4",
157-
"form-data@>=3.0.0 <3.0.4": "^3.0.4",
158-
"form-data@>=4.0.0 <4.0.4": "^4.0.4",
159-
"get-func-name": "^2.0.1",
160-
"get-func-name@<2.0.1": "^2.0.1",
161-
"got": "^11.8.5",
162-
"got@<11.8.5": "^11.8.5",
163-
"handlebars": "^4.7.9",
164-
"handlebars@>=4.0.0 <4.7.9": "^4.7.9",
165-
"handlebars@>=4.0.0 <=4.7.8": "^4.7.9",
166-
"handlebars@>=4.6.0 <=4.7.8": "^4.7.9",
167-
"http-cache-semantics": "^4.1.1",
168-
"http-cache-semantics@<4.1.1": "^4.1.1",
169-
"immutable": "^4.3.8",
170-
"immutable@>=4.0.0-rc.1 <4.3.8": "^4.3.8",
171-
"js-yaml": "^4.1.1",
172-
"js-yaml@<3.14.2": "^3.14.2",
173-
"js-yaml@>=4.0.0 <4.1.1": "^4.1.1",
174-
"json-schema": "^0.4.0",
175-
"json-schema@<0.4.0": "^0.4.0",
176-
"json5": "^1.0.2",
177-
"json5@<1.0.2": "^1.0.2",
178-
"lodash": "^4.18.0",
179-
"lodash@<4.17.21": "^4.17.21",
180-
"lodash@<=4.17.23": "^4.18.0",
181-
"lodash@>=4.0.0 <4.17.21": "^4.17.21",
182-
"lodash@>=4.0.0 <=4.17.22": "^4.17.23",
183-
"lodash@>=4.0.0 <=4.17.23": "^4.18.0",
184-
"marked": "^4.0.10",
185-
"marked@<4.0.10": "^4.0.10",
186-
"micromatch": "^4.0.8",
187-
"micromatch@<4.0.8": "^4.0.8",
188-
"min-document@<=2.19.0": "^2.19.1",
189-
"minimatch": "^5.1.8",
190-
"minimatch@<3.0.5": "^3.0.5",
191-
"minimatch@<3.1.3": "^3.1.3",
192-
"minimatch@<3.1.4": "^3.1.4",
193-
"minimatch@>=5.0.0 <5.1.7": "^5.1.7",
194-
"minimatch@>=5.0.0 <5.1.8": "^5.1.8",
195-
"minimist": "^1.2.6",
196-
"minimist@>=1.0.0 <1.2.6": "^1.2.6",
197-
"node-fetch": "^2.6.7",
198-
"node-fetch@<2.6.7": "^2.6.7",
199-
"path-to-regexp": "^0.1.13",
200-
"path-to-regexp@<0.1.10": "^0.1.10",
201-
"path-to-regexp@<0.1.12": "^0.1.12",
202-
"path-to-regexp@<0.1.13": "^0.1.13",
203-
"pbkdf2": "^3.1.3",
204-
"pbkdf2@>=1.0.0 <=3.1.2": "^3.1.3",
205-
"pbkdf2@>=3.0.10 <=3.1.2": "^3.1.3",
206-
"picomatch": "^4.0.4",
207-
"picomatch@<2.3.2": "^2.3.2",
208-
"picomatch@>=4.0.0 <4.0.4": "^4.0.4",
209-
"qs": "^6.14.1",
210-
"qs@<6.14.1": "^6.14.1",
211-
"qs@>=6.10.0 <6.10.3": "^6.10.3",
212-
"qs@>=6.5.0 <6.5.3": "^6.5.3",
213-
"qs@>=6.7.0 <6.7.3": "^6.7.3",
214-
"qs@>=6.7.0 <=6.14.1": "^6.14.2",
215-
"request": "npm:@cypress/request@3.0.10",
216-
"secp256k1": "^4.0.4",
217-
"secp256k1@<=3.8.0": "^3.8.1",
218-
"secp256k1@>=4.0.0 <4.0.4": "^4.0.4",
219-
"semver": "^7.5.2",
220-
"semver@>=2.0.0-alpha <5.7.2": "^5.7.2",
221-
"semver@>=6.0.0 <6.3.1": "^6.3.1",
222-
"semver@>=7.0.0 <7.5.2": "^7.5.2",
223-
"send@<0.19.0": "^0.19.0",
224-
"serialize-javascript": "^7.0.5",
225-
"serialize-javascript@<7.0.5": "^7.0.5",
226-
"serialize-javascript@<=7.0.2": "^7.0.3",
227-
"serve-static@<1.16.0": "^1.16.0",
228-
"sha.js": "^2.4.12",
229-
"sha.js@<=2.4.11": "^2.4.12",
230-
"shelljs": "^0.8.5",
231-
"shelljs@<0.8.5": "^0.8.5",
232-
"simple-get": "^2.8.2",
233-
"simple-get@<2.8.2": "^2.8.2",
234-
"tar": "^7.5.11",
235-
"tar@<6.2.1": "^6.2.1",
236-
"tar@<7.5.7": "^7.5.7",
237-
"tar@<7.5.8": "^7.5.8",
238-
"tar@<=7.5.10": "^7.5.11",
239-
"tar@<=7.5.2": "^7.5.3",
240-
"tar@<=7.5.3": "^7.5.4",
241-
"tar@<=7.5.9": "^7.5.10",
242-
"tmp@<=0.2.3": "^0.2.4",
243-
"tough-cookie": "^4.1.3",
244-
"tough-cookie@<4.1.3": "^4.1.3",
245-
"underscore": "^1.13.8",
246-
"underscore@<=1.13.7": "^1.13.8",
247-
"underscore@>=1.3.2 <1.12.1": "^1.12.1",
248-
"undici": "6.24.0",
249-
"undici@<6.24.0": "6.24.0",
250-
"word-wrap": "^1.2.4",
251-
"word-wrap@<1.2.4": "^1.2.4",
252-
"ws": "^7.5.10",
253-
"ws@>=2.1.0 <5.2.4": "^5.2.4",
254-
"ws@>=7.0.0 <7.5.10": "^7.5.10",
255-
"yargs-parser": "^5.0.1",
256-
"yargs-parser@<=5.0.0": "^5.0.1"
257-
}
258-
}
89+
"packageManager": "pnpm@10.33.0"
25990
}

0 commit comments

Comments
 (0)