Skip to content

Commit 47e47b8

Browse files
authored
Merge pull request #22 from MichaelPesce/use-regular-install
Upgrade node to 22.3.0, go back to npm install
2 parents 9072d82 + 42fba85 commit 47e47b8

4 files changed

Lines changed: 10 additions & 23 deletions

File tree

.github/workflows/main.yml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,10 @@ jobs:
5050
run: |
5151
echo REACT_APP_THEME=watertap >> .env
5252
53-
- name: Enable corepack
54-
run: corepack enable
55-
56-
- name: Install frontend JS dependencies using pnpm
53+
- name: Install frontend JS dependencies
5754
working-directory: ./frontend
5855
run: |
59-
pnpm install --prefer-offline --frozen-lockfile --reporter=ndjson
56+
npm install
6057
6158
- name: Install Python package
6259
run: |
@@ -79,18 +76,6 @@ jobs:
7976
working-directory: frontend
8077
run: npm run test
8178

82-
- name: Cache Cypress binary
83-
uses: actions/cache@v4
84-
with:
85-
path: ~/.cache/Cypress
86-
key: cypress-cache-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}
87-
restore-keys: |
88-
cypress-cache-${{ runner.os }}-
89-
90-
- name: Install Cypress binary
91-
working-directory: frontend
92-
run: npx cypress install
93-
9479
- name: Cypress e2e tests
9580
working-directory: frontend
9681
timeout-minutes: 45

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ channels:
44
dependencies:
55
- python=3.12
66
- pip
7-
- nodejs=20.9.0
7+
- nodejs=22.3.0
88
- pip:
99
- -r backend/requirements.txt

frontend/package-lock.json

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,6 @@
5959
"last 1 safari version"
6060
]
6161
},
62-
"homepage": "."
62+
"homepage": ".",
63+
"packageManager": "pnpm@10.10.0+sha1.f657bc37aa5e08da2ecff3877fe3bbb4b13703ba"
6364
}

0 commit comments

Comments
 (0)