Skip to content

Commit

Permalink
Upgrade to pnpm 8
Browse files Browse the repository at this point in the history
  • Loading branch information
PurkkaKoodari committed Feb 23, 2024
1 parent 3a859e7 commit b89ef98
Show file tree
Hide file tree
Showing 7 changed files with 1,484 additions and 1,344 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- uses: pnpm/action-setup@v3
with:
version: 7
version: 8

- name: Setup Node.js
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/npm-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- uses: pnpm/action-setup@v3
with:
version: 7
version: 8

- name: Setup Node.js for NPM
uses: actions/setup-node@v4
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ COPY packages /opt/ilmomasiina/packages
WORKDIR /opt/ilmomasiina

# Install dependencies (we're running as root, so the postinstall script doesn't run automatically)
RUN npm install -g pnpm@7 && pnpm install --frozen-lockfile
RUN npm install -g pnpm@8 && pnpm install --frozen-lockfile

# Default to production (after pnpm install, so we get our types etc.)
ENV NODE_ENV=production
Expand Down Expand Up @@ -49,7 +49,7 @@ COPY packages /opt/ilmomasiina/packages
WORKDIR /opt/ilmomasiina

# Install dependencies for backend only
RUN npm install -g pnpm@7 && pnpm install --frozen-lockfile --prod --filter @tietokilta/ilmomasiina-backend --filter @tietokilta/ilmomasiina-models
RUN npm install -g pnpm@8 && pnpm install --frozen-lockfile --prod --filter @tietokilta/ilmomasiina-backend --filter @tietokilta/ilmomasiina-models

# Copy compiled ilmomasiina-models from build stage
COPY --from=builder /opt/ilmomasiina/packages/ilmomasiina-models/dist /opt/ilmomasiina/packages/ilmomasiina-models/dist
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ ENV NODE_ENV=development
ENV HOST=0.0.0.0

# Install dependencies (we're running as root, so the postinstall script doesn't run automatically)
RUN npm install -g pnpm@7 && pnpm install --frozen-lockfile
RUN npm install -g pnpm@8 && pnpm install --frozen-lockfile
4 changes: 2 additions & 2 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ If you don't want to use Docker Compose, or already have a database, you can run
You can also set up a production deployment without Docker. **This method is not recommended.**
1. Install a suitable Node version (e.g. using nvm).
2. Run `npm install -g pnpm@7` to install pnpm. Then run `pnpm install --frozen-lockfile` to setup cross-dependencies
2. Run `npm install -g pnpm@8` to install pnpm. Then run `pnpm install --frozen-lockfile` to setup cross-dependencies
between packages and install other dependencies.
3. Create a `.env` file at the root of this repository. You can copy [.env.example](../.env.example) to begin and read the instructions within.
4. **Optional:** Make [customizations](#customization) in other files if necessary.
Expand Down Expand Up @@ -389,7 +389,7 @@ Currently Prettier is not used in the project, so here is a recommended `.vscode
- You can also use Docker for a database.
- SQLite may also work, but is currently untested.
3. Create a `.env` file at the root of this repository. You can copy [.env.example](../.env.example) to begin and read the instructions within.
4. Run `npm install -g pnpm@7` to install pnpm. Then run `pnpm install --frozen-lockfile` to setup cross-dependencies
4. Run `npm install -g pnpm@8` to install pnpm. Then run `pnpm install --frozen-lockfile` to setup cross-dependencies
between packages and install other dependencies.
5. Run `npm start` or `pnpm start`. This will start the frontend and backend dev servers in parallel.
- If you want cleaner output, you can run `npm start` separately in `packages/ilmomasiina-frontend` and
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-simple-import-sort": "^10.0.0",
"pnpm": "^7.25.0",
"pnpm": "^8.15.3",
"typescript": "~5.2.2"
},
"browserslist": {
Expand Down
Loading

0 comments on commit b89ef98

Please sign in to comment.