Skip to content

Commit ab5dfaa

Browse files
committed
Merge branch 'v2-dev'
2 parents e64cfa7 + c92fb1c commit ab5dfaa

File tree

5 files changed

+36
-73
lines changed

5 files changed

+36
-73
lines changed

.npmignore

-52
This file was deleted.

CHANGELOG.md

-1
This file was deleted.

FOR_MAINTAINERS.md

+22-13
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ This is the documentation that will be used by the maintainers. If you have idea
33

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

87
## Labels
98
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
@@ -18,35 +17,45 @@ We have several labels that can be used to organize issues and PRs on this repo
1817
## Releasing a new version
1918
To fully release a new version, you need to have access to the @materializecss organization on the npmjs. Then, please follow the steps below:
2019

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.
20+
1. In your local copy of Materialize, go into the dev Branch with `git checkout v2-dev` and pull the newest version
21+
with `git pull origin v2-dev` to have the newest version from the server. Run Tests and check if everything works.
2322

24-
2. Make a new Release branch with `git checkout -b release-2.X.X-alpha`.
23+
2. Create a new Release branch with `git checkout -b release-2.X.X-alpha`.
2524
In case something happend or needs to be changed during the release it is better to keep the release on its own branch.
2625

2726
3. Run `npm run release -- --oldver=<current_version> --newver=<new_version>`
2827
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```
28+
```npm run release -- --oldver=1.0.0 --newver=1.1.0```
3029

31-
4. Verify that version is correctly replaced in:
30+
4. Verify that the version is correctly replaced and files were generated in:
3231
* package.json
33-
* src\global.ts
34-
* the docs* correctly show the new version `npm run dev`
32+
* src/global.ts
33+
* dist/js
34+
* dist/css
3535

3636
5. Add Commit with message "chore: release 2.X.X-alpha". Then push to server.
3737

3838
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
3939

4040
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
41+
* Click generate Release notes automatically and select previeous version (commit-lint of commit-messages is important here)
42+
* Upload the `materialize-v<new_version>.zip` from the bin-folder
4343
* Create a new tag together with the release
4444

45-
8. Merge the Pull Request after 3 days if there are no concerns and all checks passed.
45+
8. Merge the Pull Request if all checks pass and there were no concerns.
4646
* Set the draft release to public.
4747

48-
9. Publish the release on npmjs
48+
9. Checkout and pull the new **main**-branch locally, merge it back into the **dev**-branch. Then push to server. [Explanation here](https://stackoverflow.com/a/72959052)
49+
```git checkout main
50+
git pull origin main
51+
git checkout v2-dev
52+
git pull origin v2-dev
53+
git merge main
54+
git push origin v2-dev
55+
```
56+
57+
10. Publish the release on npmjs
4958
* If you never logged in on npm, please do `npm login` first and enter your credentials
5059
* Then run `npm publish` and follow the instructions there
5160

52-
10. Done! Yay new version 🥳
61+
11. Done! Yay new version 🥳

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2019 Materialize
3+
Copyright (c) 2014-2023 Materialize
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

package.json

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "@materializecss/materialize",
3-
"description": "Builds Materialize distribution packages",
4-
"author": "Alvin Wang, Alan Chang",
5-
"homepage": "https://materializecss.github.io/materialize/",
3+
"description": "The responsive front-end library based on Material Design from Google.",
4+
"author": "The Materialize Team",
5+
"homepage": "https://materializeweb.com",
66
"version": "2.0.3",
77
"main": "dist/js/materialize.js",
88
"module": "src/index.ts",
@@ -17,6 +17,16 @@
1717
"bugs": {
1818
"url": "https://github.com/materializecss/materialize/issues"
1919
},
20+
"funding": [
21+
{
22+
"type": "github",
23+
"url": "https://github.com/sponsors/materializecss"
24+
},
25+
{
26+
"type": "opencollective",
27+
"url": "https://opencollective.com/materialize"
28+
}
29+
],
2030
"scripts": {
2131
"dev": "grunt monitor",
2232
"test": "grunt test",
@@ -74,10 +84,7 @@
7484
},
7585
"files": [
7686
"dist",
77-
"extras",
78-
"src/**/*.ts",
7987
"sass/**/*.scss",
80-
"Gruntfile.js",
8188
"LICENSE"
8289
],
8390
"config": {

0 commit comments

Comments
 (0)