Skip to content

Commit 407dee9

Browse files
author
Nils Henning
committed
Merge branch 'redo-all-the-rendering-related-things' into next-release
2 parents e6276e2 + 86ab522 commit 407dee9

File tree

7 files changed

+14
-16
lines changed

7 files changed

+14
-16
lines changed

docs/contribute/README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,13 @@ docs/components/div.md
160160
[Webpacker](https://github.com/rails/webpacker) is used for managing all JS assets. In order to create production-ready assets, run the [task](https://github.com/matestack/matestack-ui-core/blob/master/Rakefile)
161161

162162
```shell
163-
bin/rails webpack
163+
docker-compose run --rm webpack-watcher bash
164+
cd builder
165+
bundle exec rails webpacker:compile RAILS_ENV=production
164166
```
165167

166-
from the matestack-ui-core repository root folder. The assets will be exported to [`vendor/assets/javascripts/dist`](https://github.com/matestack/matestack-ui-core/tree/master/vendor/assets/javascripts/dist).
168+
The assets will be exported to [`vendor/assets/javascripts/dist`](https://github.com/matestack/matestack-ui-core/tree/master/vendor/assets/javascripts/dist).
167169

168170
Under the hood, we use a "builder" app in the [`builder`](https://github.com/matestack/matestack-ui-core/tree/master/builder) folder in order to run webpacker and create the assets. Its webpack(er) configuration can be found in [`builder/config`](https://github.com/matestack/matestack-ui-core/tree/master/builder/config).
169171

170-
When creating a new matestack-ui-core release, make sure to also change the version number accordingly in [`package.json`](https://github.com/matestack/matestack-ui-core/blob/master/package.json) and to create a corresponding [version tag on github](https://github.com/matestack/matestack-ui-core/tags).
172+
When creating a new matestack-ui-core release, make sure to also change the version number accordingly in [`package.json`](https://github.com/matestack/matestack-ui-core/blob/master/package.json) and to create a corresponding [version tag on github](https://github.com/matestack/matestack-ui-core/tags).

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matestack-ui-core",
3-
"version": "0.7.4",
3+
"version": "1.0.0-rc1",
44
"main": "app/javascript/matestack-ui-core",
55
"private": true,
66
"dependencies": {

vendor/assets/javascripts/dist/manifest.json

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,17 @@
22
"entrypoints": {
33
"matestack-ui-core": {
44
"css": [
5-
"/dist/matestack-ui-core.css"
5+
"/dist/matestack-ui-core.min.css"
66
],
77
"js": [
8-
"/dist/matestack-ui-core.js"
9-
],
10-
"css.map": [
11-
"/dist/matestack-ui-core.css.map"
8+
"/dist/matestack-ui-core.min.js"
129
],
1310
"js.map": [
14-
"/dist/matestack-ui-core.js.map"
11+
"/dist/matestack-ui-core.min.js.map"
1512
]
1613
}
1714
},
18-
"matestack-ui-core.css": "/dist/matestack-ui-core.css",
19-
"matestack-ui-core.css.map": "/dist/matestack-ui-core.css.map",
20-
"matestack-ui-core.js": "/dist/matestack-ui-core.js",
21-
"matestack-ui-core.js.map": "/dist/matestack-ui-core.js.map"
15+
"matestack-ui-core.css": "/dist/matestack-ui-core.min.css",
16+
"matestack-ui-core.js": "/dist/matestack-ui-core.min.js",
17+
"matestack-ui-core.js.map": "/dist/matestack-ui-core.min.js.map"
2218
}

vendor/assets/javascripts/dist/matestack-ui-core.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

vendor/assets/javascripts/dist/matestack-ui-core.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

0 commit comments

Comments
 (0)