Skip to content

Commit b485c2e

Browse files
sethiddensethidden
authored
chore: update turbo to v2 (#3186)
* chore: update turbo to v2 * Set yarn config just before publish This prevents .yarnrc failing to source NODE_AUTH_TOKEN when building This repo is public so there's no need to auth before building deps
1 parent 11bfada commit b485c2e

File tree

4 files changed

+43
-43
lines changed

4 files changed

+43
-43
lines changed

‎.github/workflows/ci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -214,17 +214,17 @@ jobs:
214214
registry-url: 'https://registry.npmjs.org'
215215
- name: Install dependencies
216216
run: yarn --immutable
217-
- name: Set yarn config
218-
run: |
219-
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
220-
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
221-
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
222217
- name: Bump package version
223218
run: yarn changeset version --snapshot
224219
env:
225220
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
226221
- name: Build packages
227222
run: yarn build:release
223+
- name: Set yarn config
224+
run: |
225+
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
226+
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
227+
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
228228
- name: Publish canary version
229229
run: yarn workspaces foreach --no-private --from '@storefront-ui/*' npm publish --tag canary || true
230230
env:
@@ -249,16 +249,16 @@ jobs:
249249
registry-url: 'https://registry.npmjs.org'
250250
- name: Install dependencies
251251
run: yarn --immutable
252-
- name: Set yarn config
253-
run: |
254-
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
255-
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
256-
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
257252
- name: Save head commit message
258253
id: commit_message
259254
run: echo "result=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT
260255
- name: Build packages
261256
run: yarn build:release
257+
- name: Set yarn config
258+
run: |
259+
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
260+
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
261+
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
262262
- name: Publish release-candidate version
263263
# If this is any `v2-release/**` branch AND last commit is made by changeset action and its commit message is with "ci: release (rc)", this happens only after merging changesets changelog PR
264264
if: "${{ startsWith( github.event.pull_request.head.ref, 'v2-release' ) && contains( steps.commit_message.outputs.result, 'ci: version packages (rc)' ) }}"
@@ -287,13 +287,13 @@ jobs:
287287
registry-url: 'https://registry.npmjs.org'
288288
- name: Install dependencies
289289
run: yarn --immutable
290+
- name: Build packages
291+
run: yarn build:release
290292
- name: Set yarn config
291293
run: |
292294
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
293295
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
294296
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
295-
- name: Build packages
296-
run: yarn build:release
297297
- name: Publish Production version package
298298
run: yarn workspaces foreach --no-private --from '@storefront-ui/*' npm publish || true
299299
env:

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"rimraf": "^5.0.0",
7575
"rollup-plugin-preserve-directives": "^0.4.0",
7676
"tailwindcss": "^3.4.3",
77-
"turbo": "latest",
77+
"turbo": "^2.0.10-canary.1",
7878
"typescript": "^5.4.5",
7979
"unified": "^11.0.4",
8080
"wait-on": "^7.0.1"

‎turbo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://turborepo.org/schema.json",
3-
"pipeline": {
3+
"tasks": {
44
"build": {
55
"cache": false,
66
"dependsOn": [

‎yarn.lock

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4713,7 +4713,7 @@ __metadata:
47134713
rimraf: ^5.0.0
47144714
rollup-plugin-preserve-directives: ^0.4.0
47154715
tailwindcss: ^3.4.3
4716-
turbo: latest
4716+
turbo: ^2.0.10-canary.1
47174717
typescript: ^5.4.5
47184718
unified: ^11.0.4
47194719
wait-on: ^7.0.1
@@ -22257,58 +22257,58 @@ __metadata:
2225722257
languageName: node
2225822258
linkType: hard
2225922259

22260-
"turbo-darwin-64@npm:1.13.3":
22261-
version: 1.13.3
22262-
resolution: "turbo-darwin-64@npm:1.13.3"
22260+
"turbo-darwin-64@npm:2.0.10-canary.1":
22261+
version: 2.0.10-canary.1
22262+
resolution: "turbo-darwin-64@npm:2.0.10-canary.1"
2226322263
conditions: os=darwin & cpu=x64
2226422264
languageName: node
2226522265
linkType: hard
2226622266

22267-
"turbo-darwin-arm64@npm:1.13.3":
22268-
version: 1.13.3
22269-
resolution: "turbo-darwin-arm64@npm:1.13.3"
22267+
"turbo-darwin-arm64@npm:2.0.10-canary.1":
22268+
version: 2.0.10-canary.1
22269+
resolution: "turbo-darwin-arm64@npm:2.0.10-canary.1"
2227022270
conditions: os=darwin & cpu=arm64
2227122271
languageName: node
2227222272
linkType: hard
2227322273

22274-
"turbo-linux-64@npm:1.13.3":
22275-
version: 1.13.3
22276-
resolution: "turbo-linux-64@npm:1.13.3"
22274+
"turbo-linux-64@npm:2.0.10-canary.1":
22275+
version: 2.0.10-canary.1
22276+
resolution: "turbo-linux-64@npm:2.0.10-canary.1"
2227722277
conditions: os=linux & cpu=x64
2227822278
languageName: node
2227922279
linkType: hard
2228022280

22281-
"turbo-linux-arm64@npm:1.13.3":
22282-
version: 1.13.3
22283-
resolution: "turbo-linux-arm64@npm:1.13.3"
22281+
"turbo-linux-arm64@npm:2.0.10-canary.1":
22282+
version: 2.0.10-canary.1
22283+
resolution: "turbo-linux-arm64@npm:2.0.10-canary.1"
2228422284
conditions: os=linux & cpu=arm64
2228522285
languageName: node
2228622286
linkType: hard
2228722287

22288-
"turbo-windows-64@npm:1.13.3":
22289-
version: 1.13.3
22290-
resolution: "turbo-windows-64@npm:1.13.3"
22288+
"turbo-windows-64@npm:2.0.10-canary.1":
22289+
version: 2.0.10-canary.1
22290+
resolution: "turbo-windows-64@npm:2.0.10-canary.1"
2229122291
conditions: os=win32 & cpu=x64
2229222292
languageName: node
2229322293
linkType: hard
2229422294

22295-
"turbo-windows-arm64@npm:1.13.3":
22296-
version: 1.13.3
22297-
resolution: "turbo-windows-arm64@npm:1.13.3"
22295+
"turbo-windows-arm64@npm:2.0.10-canary.1":
22296+
version: 2.0.10-canary.1
22297+
resolution: "turbo-windows-arm64@npm:2.0.10-canary.1"
2229822298
conditions: os=win32 & cpu=arm64
2229922299
languageName: node
2230022300
linkType: hard
2230122301

22302-
"turbo@npm:latest":
22303-
version: 1.13.3
22304-
resolution: "turbo@npm:1.13.3"
22302+
"turbo@npm:^2.0.10-canary.1":
22303+
version: 2.0.10-canary.1
22304+
resolution: "turbo@npm:2.0.10-canary.1"
2230522305
dependencies:
22306-
turbo-darwin-64: 1.13.3
22307-
turbo-darwin-arm64: 1.13.3
22308-
turbo-linux-64: 1.13.3
22309-
turbo-linux-arm64: 1.13.3
22310-
turbo-windows-64: 1.13.3
22311-
turbo-windows-arm64: 1.13.3
22306+
turbo-darwin-64: 2.0.10-canary.1
22307+
turbo-darwin-arm64: 2.0.10-canary.1
22308+
turbo-linux-64: 2.0.10-canary.1
22309+
turbo-linux-arm64: 2.0.10-canary.1
22310+
turbo-windows-64: 2.0.10-canary.1
22311+
turbo-windows-arm64: 2.0.10-canary.1
2231222312
dependenciesMeta:
2231322313
turbo-darwin-64:
2231422314
optional: true
@@ -22324,7 +22324,7 @@ __metadata:
2232422324
optional: true
2232522325
bin:
2232622326
turbo: bin/turbo
22327-
checksum: d00655987e5d2e714d5e5a8d5950624508fb69e8671ca17e8ac7b9316ce01e518308ec4eaa472306950782704caa2eaa3c4fb328192818fcd9fcc05423bc29e7
22327+
checksum: 60fde9bd00c911a545b02f69185098cfd594d96d776a01f99b102384d3eafb927502f07317e04b272c6596dd6bcfdc1a97977cf1db7cb465d756a0dbb5313c5d
2232822328
languageName: node
2232922329
linkType: hard
2233022330

0 commit comments

Comments
 (0)