Skip to content

Commit eb0fc42

Browse files
authored
Merge pull request #395 from materializecss/release-2.0.2-alpha
Release 2.0.2 alpha
2 parents bf29da7 + b25faf6 commit eb0fc42

Some content is hidden

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

66 files changed

+11182
-18516
lines changed

FOR_MAINTAINERS.md

Lines changed: 27 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
# For Maintainers
2-
This is the documentation that will be used by the maintainers. If you have any better idea on how to do things better, please let us know by creating an issue or PR 😉.
2+
This is the documentation that will be used by the maintainers. If you have ideas on how to do things better, please let us know by creating an issue or PR 😉.
33

44
- [Labels](#labels)
55
- [Releasing a new version](#releasing-a-new-version)
66
- [Generating CHANGELOG.md](#generating-changelogmd)
77

88
## Labels
9-
We have several labels that we can use to organize the issues and PRs on this repo, and also to make the changelog generation easier. All the labels and their descriptions can be [read here](https://github.com/materializecss/materialize/issues/labels).
10-
11-
But there are important labels that are related to [changelog generation](#generating-changelogmd), which will determine where all the merged PRs end up. Any other PRs that hasn't labeled with one of these will not be shown on the changelog. Please take a look at the table below
9+
We have several labels that can be used to organize issues and PRs on this repo and also to make the changelog generation easier. All the labels and their descriptions can be [read here](https://github.com/materializecss/materialize/issues/labels). Any other PRs that hasn't labeled with one of these will not be shown on the changelog. Please take a look at the table below
1210

1311
| Label | Section |
1412
|---------------|--------------------------|
@@ -19,50 +17,36 @@ But there are important labels that are related to [changelog generation](#gener
1917

2018
## Releasing a new version
2119
To fully release a new version, you need to have access to the @materializecss organization on the npmjs. Then, please follow the steps below:
22-
1. Run `npm run release -- --oldver=<current_version> --newver=<new_version>`
23-
> What this command does is that it will replace any occurrences of "<current_version>" with the "<new_version>". So for example, if the current release is `1.0.0`, and then the planned release is `1.1.0`, the command is
24-
> ```
25-
> npm run release -- --oldver=1.0.0 --newver=1.1.0
26-
> ```
27-
2. Verify that version is correctly replaced in:
20+
21+
1. In your local copy of Materialize, step into the dev Branch with `git checkout v2-dev` and pull the newest version
22+
with `git pull origin v2-dev` to have the newest version. Run Tests and check if everything works.
23+
24+
2. Make a new Release branch with `git checkout -b release-2.X.X-alpha`.
25+
In case something happend or needs to be changed during the release it is better to keep the release on its own branch.
26+
27+
3. Run `npm run release -- --oldver=<current_version> --newver=<new_version>`
28+
What this command does is that it will replace any occurrences of "<current_version>" with the "<new_version>". So for example, if the current release is `1.0.0`, and then the planned release is `1.1.0`, the command would be
29+
```npm run release -- --oldver=1.0.0 --newver=1.1.0```
30+
31+
4. Verify that version is correctly replaced in:
2832
* package.json
2933
* src\global.ts
30-
* the docs correctly shown the new version
31-
3. DEPRECATED: Changelog is generated by GitHub [Then generate the CHANGELOG.md](#generating-changelogmd)
32-
4. Create a PR ([example](https://github.com/materializecss/materialize/pull/258) so that we can verify nothing goes wrong, address the feedback from the reviewers if there is any
33-
5. Merge the PR after most (hopefully everyone) happy with the planned release PR
34-
6. Create a new release on GitHub
35-
* With release notes from the generated CHANGELOG.md
36-
* Upload the `materialize-v<new_vversion>.zip` from the bin folder
37-
* Don't forget to create a new tag together with the release
38-
7. Publish the release on npmjs
39-
* If you never logged in on npm, please do `npm login` first and enter your credentials
40-
* Then run `npm publish` and follow the instructions there
41-
8. Done! Yay new version 🥳
34+
* the docs* correctly show the new version `npm run dev`
4235

43-
## Generating CHANGELOG.md
44-
To generate the CHANGELOG.md, we will use [github-changelog-generator](https://github.com/github-changelog-generator/github-changelog-generator) to automatically generate it. The changelog will be generated based on merged PRs. So if you have any changes that need to be mentioned on release notes, please avoid commit it directly to the main branch, and do create a PR for it.
36+
5. Add Commit with message "chore: release 2.X.X-alpha". Then push to server.
4537

46-
Also it's important that if you want to merge the PR, **please use "merge and commit", do not squash**. Because for some reason the generator can't recognize the squashed PRs.
38+
6. Create a Pull Request (PR) ([example](https://github.com/materializecss/materialize/pull/258) so that we can verify nothing goes wrong, address the feedback from the reviewers if there is any
4739

48-
> I think this is noteworthy to mention it on their repo, maybe also fix it?
40+
7. Create a new (draft) release on GitHub
41+
* Generate the Release notes automatically
42+
* Upload the `materialize-v<new_vversion>.zip` from the bin-folder
43+
* Create a new tag together with the release
4944

50-
To make it easier, you can use Docker to run it. You can use the command below to get started.
45+
8. Merge the Pull Request after 3 days if there are no concerns and all checks passed.
46+
* Set the draft release to public.
5147

52-
```
53-
docker run -it --rm \
54-
-v "$(pwd)":/usr/local/src/your-app \
55-
githubchangeloggenerator/github-changelog-generator \
56-
-u materializecss \
57-
-p materialize \
58-
--base dontusehistorypls.md \
59-
--since-tag 1.0.0 \
60-
--token <your_GitHub_token> \
61-
--no-issues \
62-
--future-release 1.1.0 \
63-
--bug-labels bug,bugfix \
64-
--breaking-labels "breaking changes" \
65-
--add-section '{"docs":{"labels":["documentation"],"prefix":"**Documentation changes:**"},"meta":{"labels":["build","meta"],"prefix":"**Meta changes:**"}}'
66-
```
48+
9. Publish the release on npmjs
49+
* If you never logged in on npm, please do `npm login` first and enter your credentials
50+
* Then run `npm publish` and follow the instructions there
6751

68-
Btw, the `--token` param is optional. But since GitHub API has rate limitations for unauthenticated requests, I recommend you to use the token. [You can follow the instructions from their repo.](https://github.com/github-changelog-generator/github-changelog-generator#github-token)
52+
10. Done! Yay new version 🥳

Gruntfile.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,14 @@ module.exports = function(grunt) {
137137
prod_min: Object.assign({}, webpackConfig, {
138138
mode: 'production',
139139
devtool: 'source-map',
140+
optimization: {
141+
minimize: true
142+
},
140143
output: {
141144
filename: 'materialize.min.js',
142145
path: path.resolve(__dirname, 'dist/js'),
143-
libraryTarget: 'umd',
144-
globalObject: 'this'
146+
libraryTarget: 'umd',
147+
globalObject: 'this'
145148
}
146149
}),
147150
},

0 commit comments

Comments
 (0)