Skip to content

Commit 2b043fb

Browse files
committed
Merge branch 'release/2.0.0-beta.1'
2 parents 494c4d5 + be89010 commit 2b043fb

File tree

10 files changed

+322
-18
lines changed

10 files changed

+322
-18
lines changed

.github/workflows/release.yml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
- uses: actions/setup-node@v1
1515
with:
16-
node-version: 15
16+
node-version: 16
1717
registry-url: https://registry.npmjs.org/
1818

1919
- run: npm ci
@@ -33,7 +33,15 @@ jobs:
3333
path_to_write_report: ./codecov_report.txt
3434
verbose: true
3535

36-
- run: cd dist && ls -al && npm publish --tag next
36+
- run: |
37+
cd dist
38+
ls -al
39+
VERSION=${GITHUB_REF/refs\/tags\//}
40+
TAG='latest'
41+
if [[ $VERSION =~ 'alpha' || $VERSION =~ 'beta' ]]; then
42+
TAG='next'
43+
fi
44+
npm publish --tag $TAG
3745
env:
3846
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
3947
@@ -47,10 +55,15 @@ jobs:
4755
echo "Setting release version to $VERSION"
4856
echo "release_version=$VERSION" >> $GITHUB_ENV
4957
50-
# Parse tag message
51-
CHANGELOG=$(git for-each-ref $GITHUB_REF | tail -n+3)
58+
PRERELEASE=false
59+
# Check release type
60+
if [[ $VERSION =~ 'alpha' || $VERSION =~ 'beta' ]]; then
61+
echo "This is a prerelease."
62+
PRERELEASE=true
63+
fi
64+
echo "is_prerelease=$PRERELEASE" >> $GITHUB_ENV
5265
53-
echo $CHANGELOG
66+
CHANGELOG=$(git show refs/tags/1.7.0 | tail -n+7)
5467
5568
# Set markdown titles
5669
CHANGELOG=${CHANGELOG/Added/## Added}
@@ -60,19 +73,16 @@ jobs:
6073
CHANGELOG=${CHANGELOG/Deprecated/## Deprecated}
6174
CHANGELOG=${CHANGELOG/Security/## Security}
6275
63-
echo $CHANGELOG
64-
6576
# Remove PGP signature
6677
CHANGELOG="${CHANGELOG%-----BEGIN*}"
6778
68-
echo $CHANGELOG
79+
echo "$CHANGELOG"
6980
7081
# Change linebreaks and other special characters
7182
CHANGELOG="${CHANGELOG//'%'/'%25'}"
7283
CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
7384
CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
7485
75-
echo "Setting changelog body to:"
7686
echo $CHANGELOG
7787
7888
echo 'changelog<<EOF' >> $GITHUB_ENV
@@ -90,4 +100,4 @@ jobs:
90100
release_name: v${{ env.release_version }}
91101
body: ${{ env.changelog }}
92102
draft: false
93-
prerelease: false
103+
prerelease: ${{ env.is_prerelease }}

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@studiometa/js-toolkit-workspace",
3-
"version": "2.0.0-beta.0",
3+
"version": "2.0.0-beta.1",
44
"private": true,
55
"workspaces": [
66
"packages/*"

packages/demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@studiometa/js-toolkit-demo",
3-
"version": "2.0.0-beta.0",
3+
"version": "2.0.0-beta.1",
44
"private": true,
55
"type": "commonjs",
66
"scripts": {

packages/docs/.vitepress/config.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,15 @@ function getGuideSidebar() {
6060
text: 'Recipes',
6161
children: [{ text: 'todo' }],
6262
},
63+
{
64+
text: 'Migration guide',
65+
children: [
66+
{
67+
text: 'v1 → v2',
68+
link: '/guide/migration/v1-to-v2.html',
69+
},
70+
],
71+
},
6372
];
6473
}
6574

packages/docs/api/instance-properties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## `$options`
44

5-
An object containing the full options of the instance as defined in the [`config.options`](#options) property. Additionnally to the options defined in the config, the following properties are also available:
5+
An object containing the full options of the instance as defined in [the `config.options` property](/api/configuration.html#config-options). Additionnally to the options defined in the config, the following properties are also available:
66

77
- `$options.name` The name of the component
88
- `$options.log` Wether the `$log` method is silent or not

0 commit comments

Comments
 (0)