Skip to content

Commit e0b7224

Browse files
authored
chore: merge pull request #2905 from vuestorefront/v2-release/2.5.0
2 parents 32f5396 + 66e6019 commit e0b7224

File tree

165 files changed

+5675
-1635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+5675
-1635
lines changed

.github/workflows/cd-v2-publish-and-create-pr.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 59 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ jobs:
191191
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_REACT }}
192192

193193
release-canary:
194-
name: Release canary package
194+
name: Release Canary packages
195195
needs: [build, build-release, cypress-react, cypress-vue]
196196
if: ${{ github.ref == 'refs/heads/v2-develop' }}
197197
# Can't use 'configure-enviroment' because it fails on dev branch
@@ -207,22 +207,27 @@ jobs:
207207
registry-url: 'https://registry.npmjs.org'
208208
- name: Install dependencies
209209
run: yarn --immutable
210+
- name: Set yarn config
211+
run: |
212+
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
213+
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
214+
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
210215
- name: Bump package version
211216
run: yarn changeset version --snapshot
212217
env:
213218
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
214-
- name: Build package
219+
- name: Build packages
215220
run: yarn build:release
216221
- name: Publish canary version
217-
run: yarn changeset publish --tag canary
222+
run: yarn workspaces foreach --no-private --from '@storefront-ui/*' npm publish --tag canary || true
218223
env:
219224
# Needs access to publish to npm
220225
# refresh token before Saturday, May 25, 2024
221226
NPM_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}
222227
NODE_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}
223228

224229
release-rc:
225-
name: Release RC package
230+
name: Release RC packages
226231
runs-on: ubuntu-latest
227232
steps:
228233
- name: Checkout code
@@ -237,15 +242,64 @@ jobs:
237242
registry-url: 'https://registry.npmjs.org'
238243
- name: Install dependencies
239244
run: yarn --immutable
245+
- name: Set yarn config
246+
run: |
247+
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
248+
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
249+
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
240250
- name: Save head commit message
241251
id: commit_message
242252
run: echo "result=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT
253+
- name: Build packages
254+
run: yarn build:release
243255
- name: Publish release-candidate version
244256
# 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
245257
if: "${{ startsWith( github.event.pull_request.head.ref, 'v2-release' ) && contains( steps.commit_message.outputs.result, 'ci: version packages (rc)' ) }}"
246-
run: yarn changeset publish
258+
run: yarn workspaces foreach --no-private --from '@storefront-ui/*' npm publish --tag rc || true
247259
env:
248260
# Needs access to publish to npm
249261
# refresh token before Saturday, May 25, 2024
250262
NPM_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}
251263
NODE_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}
264+
265+
release-production:
266+
name: Release Production packages
267+
runs-on: ubuntu-latest
268+
needs: [build, build-release, cypress-react, cypress-vue]
269+
if: ${{ github.ref == 'refs/heads/v2' }}
270+
steps:
271+
- name: Checkout code
272+
uses: actions/checkout@v3
273+
with:
274+
ref: ${{ github.event.pull_request.head.sha }}
275+
- name: Install Node.js
276+
uses: actions/setup-node@v3
277+
with:
278+
node-version-file: '.node-version'
279+
cache: 'yarn'
280+
registry-url: 'https://registry.npmjs.org'
281+
- name: Install dependencies
282+
run: yarn --immutable
283+
- name: Set yarn config
284+
run: |
285+
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
286+
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
287+
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
288+
- name: Build packages
289+
run: yarn build:release
290+
- name: Publish Production version package
291+
run: yarn workspaces foreach --no-private --from '@storefront-ui/*' npm publish || true
292+
env:
293+
# Needs access to publish to npm
294+
# refresh token before Saturday, May 25, 2024
295+
NPM_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}
296+
NODE_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}
297+
- name: Create PR to v2-develop branch
298+
env:
299+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
300+
run: |
301+
gh pr create -B v2-develop --title 'chore: automatic sync v2->v2-develop' --body 'This Pull Request is generated automatically with changes pushed into `v2` branch. `v2` and `v2-develop` branches should be in-sync.' --label automerge || true
302+
- name: Merge created PR
303+
env:
304+
GH_TOKEN: ${{ github.token }}
305+
run: gh pr merge --auto --merge

.vuestorefrontcloud/docs/default.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ server {
44
absolute_redirect off;
55

66
location /v2/figma {
7-
return 307 https://www.figma.com/file/Tw5iWaLFSUrf9cBv4BQTjC/Storefront-UI-%7C-Design-Kit-v2.4-(public)?type=design&node-id=22913-91045&mode=design&t=iEaSbApU9FfvAj8S-0;
7+
return 307 https://www.figma.com/file/Q7Nr1NvjPdcGVhykkfDg2k/Storefront-UI-%7C-Design-Kit-v2.5-(public)?type=design&node-id=22913-91045&mode=design;
88
}
99

1010
location /v2 {

.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Lines changed: 28 additions & 0 deletions
Large diffs are not rendered by default.

.yarn/releases/yarn-3.5.1.cjs renamed to .yarn/releases/yarn-3.6.1.cjs

Lines changed: 225 additions & 224 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
nodeLinker: node-modules
22

3-
yarnPath: .yarn/releases/yarn-3.5.1.cjs
3+
plugins:
4+
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
5+
spec: '@yarnpkg/plugin-workspace-tools'
6+
7+
yarnPath: .yarn/releases/yarn-3.6.1.cjs

CHANGELOG.md

Lines changed: 0 additions & 170 deletions
This file was deleted.

0 commit comments

Comments
 (0)