diff --git a/.github/workflows/actions/setup/action.yml b/.github/workflows/actions/setup/action.yml index 9b6b3a6e3..c17e99284 100644 --- a/.github/workflows/actions/setup/action.yml +++ b/.github/workflows/actions/setup/action.yml @@ -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 diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index bb941d0dd..2ca9260da 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -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" diff --git a/packages/infra/infra-core/src/lib/patterns/serviceCiConfig.ts b/packages/infra/infra-core/src/lib/patterns/serviceCiConfig.ts index 8cad4bc93..f2df43f63 100644 --- a/packages/infra/infra-core/src/lib/patterns/serviceCiConfig.ts +++ b/packages/infra/infra-core/src/lib/patterns/serviceCiConfig.ts @@ -11,9 +11,9 @@ export interface IServiceCiConfig { } export enum PnpmWorkspaceFilters { - BACKEND = 'backend', + BACKEND = 'backend...', INFRA_SHARED = 'infra-shared', - DOCS = 'docs', + DOCS = 'docs...', WEBAPP_EMAILS = 'webapp-emails', WORKERS = 'workers', CORE = 'core', @@ -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), diff --git a/packages/internal/docs/package.json b/packages/internal/docs/package.json index c1c05a332..09d1ead0f 100644 --- a/packages/internal/docs/package.json +++ b/packages/internal/docs/package.json @@ -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", diff --git a/packages/workers/Dockerfile b/packages/workers/Dockerfile index 63143492d..6f30ea41a 100644 --- a/packages/workers/Dockerfile +++ b/packages/workers/Dockerfile @@ -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