Skip to content

Commit

Permalink
fix: Fix broken builds on pnpm ^9.5.0 (#602)
Browse files Browse the repository at this point in the history
  • Loading branch information
mkleszcz authored Jul 9, 2024
1 parent 4121ece commit 57e5f6c
Show file tree
Hide file tree
Showing 7 changed files with 435 additions and 459 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ runs:
steps:
- uses: pnpm/action-setup@v2
with:
version: 9
version: 9.5.x

- name: Use Node.js ${{ inputs.node-version }}
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion bitbucket-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ definitions:
scripts:
initializeStep: &initializeStep cp .env.test .env
&& corepack enable
&& corepack prepare pnpm@9.0.6 --activate
&& corepack prepare pnpm@~9.5.0 --activate
&& export PNPM_HOME="/root/.local/share/pnpm"
&& export PATH="$PNPM_HOME:$PATH"

Expand Down
3 changes: 2 additions & 1 deletion packages/infra/infra-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"build": "tsc --project tsconfig.lib.json"
},
"devDependencies": {
"aws-sdk": "^2.1624.0"
"aws-sdk": "^2.1624.0",
"jszip": "^3.10.1"
}
}
12 changes: 6 additions & 6 deletions packages/infra/infra-core/src/lib/patterns/serviceCiConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ export interface IServiceCiConfig {
}

export enum PnpmWorkspaceFilters {
BACKEND = 'backend',
INFRA_SHARED = 'infra-shared',
DOCS = 'docs',
WEBAPP_EMAILS = 'webapp-emails',
WORKERS = 'workers',
BACKEND = 'backend...',
INFRA_SHARED = 'infra-shared...',
DOCS = 'docs...',
WEBAPP_EMAILS = 'webapp-emails...',
WORKERS = 'workers...',
CORE = 'core',
TOOLS = 'tools',
WEBAPP = 'webapp...',
Expand Down Expand Up @@ -57,7 +57,7 @@ export class ServiceCiConfig extends Construct implements IServiceCiConfig {

return [
'go install github.com/segmentio/chamber/v2@latest',
'npm i -g pnpm@^9.0.6',
'npm i -g pnpm@~9.5.0',
`pnpm install \
--include-workspace-root \
--frozen-lockfile`.concat(...filters),
Expand Down
1 change: 1 addition & 0 deletions packages/internal/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"@sb/webapp-core": "workspace:*",
"@sb/webapp-tenants": "workspace:*",
"@sb/webapp-contentful": "workspace:*",
"@sb/webapp-emails": "workspace:*",
"docusaurus-plugin-typedoc": "^0.22.0",
"typedoc": "^0.25.13",
"typedoc-plugin-markdown": "^3.17.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/workers/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN \
apt-get update && \
apt-get install -yqq nodejs && \
pip install -U pip~=23.0.1 && pip install "urllib3<2" pdm~=2.5.2 && \
npm i -g npm@^8 pnpm@^9.0.6 && \
npm i -g npm@^8 pnpm@~9.5.0 && \
rm -rf /var/lib/apt/lists/*

COPY --from=chamber /chamber /bin/chamber
Expand Down
Loading

0 comments on commit 57e5f6c

Please sign in to comment.