Skip to content

Commit

Permalink
fix: Update pnpm to 9.0.6, use workspace protocol (workspace:) instea…
Browse files Browse the repository at this point in the history
…d of `link-workspace-packages` which is now by default set to `false`
  • Loading branch information
mkleszcz committed May 6, 2024
1 parent 4e2eb3c commit 8e3ae49
Show file tree
Hide file tree
Showing 21 changed files with 22,129 additions and 18,171 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: 8
version: 9

- name: Use Node.js ${{ inputs.node-version }}
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ The full list with the descriptions can be found in the [features documentation]
- Install [Docker](https://docs.docker.com/get-docker)
- Install [Node.js](https://nodejs.org/en/download/) version 18 or above (which can be checked by running `node -v`).
You can use [nvm](https://github.com/nvm-sh/nvm) or [n](https://github.com/tj/n) for managing multiple Node versions installed on a single machine.
- Install [pnpm](https://pnpm.io/installation) version 8.6 or above (which can be checked by running `pnpm --version`)
- Install [pnpm](https://pnpm.io/installation) version 9 or above (which can be checked by running `pnpm --version`)
- (Windows only) Install [WSL 2](https://learn.microsoft.com/en-us/windows/wsl/install)

#### Optional
Expand Down
2 changes: 1 addition & 1 deletion bitbucket-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ definitions:
scripts:
initializeStep: &initializeStep cp .env.test .env
&& corepack enable
&& corepack prepare pnpm@8.6.1 --activate
&& corepack prepare pnpm@9.0.6 --activate
&& export PNPM_HOME="/root/.local/share/pnpm"
&& export PATH="$PNPM_HOME:$PATH"

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"@nx/react": "17.1.3",
"@nx/web": "17.1.3",
"@nx/webpack": "17.1.3",
"@sb/cli": "*",
"@sb/core": "*",
"@sb/cli": "workspace:*",
"@sb/core": "workspace:*",
"@storybook/addon-actions": "^8.0.9",
"@storybook/react": "^8.0.9",
"@svgr/webpack": "^8.1.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"lint:js": "eslint ."
},
"devDependencies": {
"@sb/core": "*",
"@sb/infra-core": "*",
"@sb/infra-shared": "*",
"@sb/tools": "*",
"@sb/core": "workspace:*",
"@sb/infra-core": "workspace:*",
"@sb/infra-shared": "workspace:*",
"@sb/tools": "workspace:*",
"fs-extra": "^11.2.0"
}
}
4 changes: 2 additions & 2 deletions packages/infra/infra-core/src/lib/patterns/serviceCiConfig.ts
Original file line number Diff line number Diff line change
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@^8.6.1',
'npm i -g pnpm@^9.0.6',
`pnpm install \
--include-workspace-root \
--frozen-lockfile`.concat(...filters),
Expand All @@ -78,6 +78,6 @@ export class ServiceCiConfig extends Construct implements IServiceCiConfig {
if (this.props.envSettings.CIConfig.mode === CI_MODE.PARALLEL) {
return defaultRunOrder;
}
return stage.actions.length + 1;
return stage.actions.length + 1;
}
}
4 changes: 2 additions & 2 deletions packages/infra/infra-shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
},
"devDependencies": {
"@aws-cdk/aws-apigatewayv2-alpha": "2.66.0-alpha.0",
"@sb/core": "*",
"@sb/infra-core": "*",
"@sb/core": "workspace:*",
"@sb/infra-core": "workspace:*",
"cdk-ec2-key-pair": "^3.3.3"
}
}
12 changes: 6 additions & 6 deletions packages/internal/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
"devDependencies": {
"@docusaurus/module-type-aliases": "^3.2.1",
"@docusaurus/types": "^3.2.1",
"@sb/core": "*",
"@sb/infra-core": "*",
"@sb/infra-shared": "*",
"@sb/tools": "*",
"@sb/webapp-api-client": "*",
"@sb/webapp-core": "*",
"@sb/core": "workspace:*",
"@sb/infra-core": "workspace:*",
"@sb/infra-shared": "workspace:*",
"@sb/tools": "workspace:*",
"@sb/webapp-api-client": "workspace:*",
"@sb/webapp-core": "workspace:*",
"docusaurus-plugin-typedoc": "^0.22.0",
"typedoc": "^0.25.13",
"typedoc-plugin-markdown": "^3.17.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/internal/status-dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
},
"devDependencies": {
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
"@sb/core": "*",
"@sb/infra-core": "*",
"@sb/infra-shared": "*",
"@sb/tools": "*",
"@sb/core": "workspace:*",
"@sb/infra-core": "workspace:*",
"@sb/infra-shared": "workspace:*",
"@sb/tools": "workspace:*",
"babel-plugin-styled-components": "^2.1.4"
},
"eslintConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/webapp-libs/webapp-api-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"type-check": "tsc --noEmit --project tsconfig.lib.json"
},
"dependencies": {
"@sb/webapp-core": "*",
"@sb/webapp-core": "workspace:*",
"apollo-upload-client": "^17.0.0",
"axios": "^0.28.0",
"axios-case-converter": "^0.9.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/webapp-libs/webapp-contentful/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"type-check": "tsc --noEmit --project tsconfig.lib.json"
},
"dependencies": {
"@sb/webapp-api-client": "*",
"@sb/webapp-core": "*",
"@sb/webapp-api-client": "workspace:*",
"@sb/webapp-core": "workspace:*",
"lucide-react": "^0.224.0",
"query-string": "^7.1.3"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/webapp-libs/webapp-crud-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"type-check": "tsc --noEmit --project tsconfig.lib.json"
},
"dependencies": {
"@sb/webapp-api-client": "*",
"@sb/webapp-core": "*",
"@sb/webapp-notifications": "*",
"@sb/webapp-api-client": "workspace:*",
"@sb/webapp-core": "workspace:*",
"@sb/webapp-notifications": "workspace:*",
"lucide-react": "^0.224.0",
"react-click-away-listener": "^2.2.3"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/webapp-libs/webapp-documents/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"type-check": "tsc --noEmit --project tsconfig.lib.json"
},
"dependencies": {
"@sb/webapp-api-client": "*",
"@sb/webapp-core": "*",
"@sb/webapp-api-client": "workspace:*",
"@sb/webapp-core": "workspace:*",
"lucide-react": "^0.224.0"
}
}
6 changes: 3 additions & 3 deletions packages/webapp-libs/webapp-emails/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"type-check": "tsc --noEmit --project tsconfig.lib.json"
},
"dependencies": {
"@sb/webapp-api-client": "*",
"@sb/webapp-core": "*",
"@sb/webapp-finances": "*",
"@sb/webapp-api-client": "workspace:*",
"@sb/webapp-core": "workspace:*",
"@sb/webapp-finances": "workspace:*",
"juice": "^8.1.0"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/webapp-libs/webapp-finances/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"type-check": "tsc --noEmit --project tsconfig.lib.json"
},
"dependencies": {
"@sb/webapp-api-client": "*",
"@sb/webapp-core": "*",
"@sb/webapp-notifications": "*",
"@sb/webapp-api-client": "workspace:*",
"@sb/webapp-core": "workspace:*",
"@sb/webapp-notifications": "workspace:*",
"@stripe/react-stripe-js": "^1.16.5",
"@stripe/stripe-js": "^1.54.2",
"react-click-away-listener": "^2.2.3"
Expand Down
4 changes: 2 additions & 2 deletions packages/webapp-libs/webapp-generative-ai/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"type-check": "tsc --noEmit --project tsconfig.lib.json"
},
"dependencies": {
"@sb/webapp-api-client": "*",
"@sb/webapp-core": "*",
"@sb/webapp-api-client": "workspace:*",
"@sb/webapp-core": "workspace:*",
"typewriter-effect": "^2.21.0"
}
}
4 changes: 2 additions & 2 deletions packages/webapp-libs/webapp-notifications/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"type-check": "tsc --noEmit --project tsconfig.lib.json"
},
"dependencies": {
"@sb/webapp-api-client": "*",
"@sb/webapp-core": "*",
"@sb/webapp-api-client": "workspace:*",
"@sb/webapp-core": "workspace:*",
"lucide-react": "^0.224.0",
"react-click-away-listener": "^2.2.3",
"react-infinite-scroll-hook": "^4.1.1"
Expand Down
29 changes: 12 additions & 17 deletions packages/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@
"@formatjs/intl-getcanonicallocales": "^2.3.0",
"@formatjs/intl-pluralrules": "^5.2.10",
"@originjs/vite-plugin-commonjs": "^1.0.3",
"@sb/core": "*",
"@sb/infra-core": "*",
"@sb/infra-shared": "*",
"@sb/tools": "*",
"@sb/webapp-api-client": "*",
"@sb/webapp-contentful": "*",
"@sb/webapp-core": "*",
"@sb/webapp-crud-demo": "*",
"@sb/webapp-documents": "*",
"@sb/webapp-finances": "*",
"@sb/webapp-generative-ai": "*",
"@sb/webapp-notifications": "*",
"@sb/core": "workspace:*",
"@sb/infra-core": "workspace:*",
"@sb/infra-shared": "workspace:*",
"@sb/tools": "workspace:*",
"@sb/webapp-api-client": "workspace:*",
"@sb/webapp-contentful": "workspace:*",
"@sb/webapp-core": "workspace:*",
"@sb/webapp-crud-demo": "workspace:*",
"@sb/webapp-documents": "workspace:*",
"@sb/webapp-finances": "workspace:*",
"@sb/webapp-generative-ai": "workspace:*",
"@sb/webapp-notifications": "workspace:*",
"@storybook/addon-essentials": "^8.0.9",
"@storybook/addon-measure": "^8.0.9",
"@storybook/addon-styling": "^1.3.7",
Expand All @@ -64,10 +64,5 @@
"stylelint-config-recommended-scss": "^7.0.0",
"stylelint-config-styled-components": "^0.1.1",
"stylelint-processor-styled-components": "^1.10.0"
},
"pnpm": {
"overrides": {
"react-error-overlay": "6.0.9"
}
}
}
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@^8.6.1 && \
npm i -g npm@^8 pnpm@^9.0.6 && \
rm -rf /var/lib/apt/lists/*

COPY --from=chamber /chamber /bin/chamber
Expand Down
6 changes: 3 additions & 3 deletions packages/workers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"yaml": "^2.3.4"
},
"devDependencies": {
"@sb/core": "*",
"@sb/tools": "*",
"@sb/webapp-emails": "*",
"@sb/core": "workspace:*",
"@sb/tools": "workspace:*",
"@sb/webapp-emails": "workspace:*",
"serverless": "^3.38.0",
"serverless-esbuild": "^1.48.0",
"serverless-localstack": "^1.1.2",
Expand Down
Loading

0 comments on commit 8e3ae49

Please sign in to comment.