Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix broken builds on pnpm ^9.5.0 #602

Merged
merged 2 commits into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading