Skip to content

Commit 4bb6db8

Browse files
author
Genki Katsutani
committed
Merge branch 'develop'
2 parents ee3b901 + e887551 commit 4bb6db8

File tree

9 files changed

+1117
-1922
lines changed

9 files changed

+1117
-1922
lines changed

‎.vscode/settings.json

-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
{
2-
"[html]": {
3-
"editor.defaultFormatter": "vscode.html-language-features"
4-
},
52
"editor.formatOnSave": true,
63
"emmet.includeLanguages": {
74
"riot": "html"
@@ -11,11 +8,6 @@
118
},
129
"prettier.semi": false,
1310
"prettier.singleQuote": true,
14-
"standard.options": {
15-
"plugins": ["html"]
16-
},
17-
"standard.validate": ["javascript", "html"],
18-
// .vscode/settings.json file
1911
"cssvar.files": [
2012
"./node_modules/open-props/open-props.min.css",
2113
// if you have an alternative path to where your styles are located

‎package-lock.json

+998-1,814
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "getup",
3-
"version": "10.0.0",
3+
"version": "10.0.1",
44
"description": "Frontend boilerplate",
55
"author": "nibushibu",
66
"scripts": {
@@ -25,10 +25,10 @@
2525
"watch": "run-p watch:* preview"
2626
},
2727
"dependencies": {
28-
"@fontsource/noto-sans-jp": "^5.0.17",
28+
"@fontsource/noto-sans-jp": "^5.0.18",
2929
"animejs": "^3.2.2",
30-
"open-props": "^1.6.16",
31-
"riot": "^9.1.2"
30+
"open-props": "^1.6.21",
31+
"riot": "^9.1.4"
3232
},
3333
"repository": {
3434
"type": "git",
@@ -44,24 +44,24 @@
4444
"@riotjs/register": "^9.0.0",
4545
"@riotjs/ssr": "^9.0.0",
4646
"cross-env": "^7.0.3",
47-
"esbuild": "^0.19.9",
48-
"eslint": "^8.55.0",
47+
"esbuild": "^0.20.1",
48+
"eslint": "^8.57.0",
4949
"eslint-config-prettier": "^9.1.0",
5050
"glob": "^10.3.10",
51-
"markuplint": "^3.15.0",
51+
"markuplint": "^4.3.0",
5252
"mkdirp": "^3.0.1",
5353
"npm-run-all": "^4.1.5",
5454
"onchange": "^7.1.0",
55-
"postcss": "^8.4.32",
55+
"postcss": "^8.4.35",
5656
"postcss-cli": "^11.0.0",
5757
"postcss-csso": "^6.0.1",
58-
"postcss-custom-media": "^10.0.2",
58+
"postcss-custom-media": "^10.0.3",
5959
"postcss-flexbugs-fixes": "^5.0.2",
60-
"postcss-import": "^15.1.0",
60+
"postcss-import": "^16.0.1",
6161
"postcss-media-minmax": "^5.0.0",
62-
"postcss-normalize-charset": "^6.0.0",
63-
"postcss-preset-env": "^9.3.0",
64-
"prettier": "^3.1.1",
62+
"postcss-normalize-charset": "^6.0.2",
63+
"postcss-preset-env": "^9.5.0",
64+
"prettier": "^3.2.5",
6565
"prettier-plugin-css-order": "^2.0.1"
6666
}
6767
}

‎scripts/html.mjs

+9-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,16 @@ import render from '@riotjs/ssr'
77
const srcDirPathFromProjectRoot = 'src/html/pages'
88
const outputDir = 'public'
99

10-
const files = await glob(`${srcDirPathFromProjectRoot}/**/*.riot`)
10+
const srcFiles = await glob(`${srcDirPathFromProjectRoot}/**/*.riot`)
11+
const oldFiles = await glob(`${outputDir}/**/*.html`)
1112

12-
for await (const file of files) {
13+
for await (const file of oldFiles) {
14+
fs.unlink(file, (err) => {
15+
if (err) throw err
16+
})
17+
}
18+
19+
for await (const file of srcFiles) {
1320
fs.readFile(file, 'utf-8', (err, data) => {
1421
if (err) throw err
1522

‎src/css/components.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
.c-sample-button:hover {
99
background-color: var(--color-primary);
1010
color: var(--color-white);
11-
}
11+
}

‎src/css/objects.css

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737
}
3838

3939
.o-layout--gap-none {
40-
--gap: 0;
40+
--_gap: 0;
4141
}
4242

4343
.o-layout--gap-large {
44-
--gap: 2em;
44+
--_gap: 2em;
4545
}
4646

4747
.o-layout--gap-small {
48-
--gap: 0.25em;
48+
--_gap: 0.25em;
4949
}
5050

5151
.o-layout--inline {
@@ -209,9 +209,9 @@
209209
white-space: nowrap;
210210
}
211211

212-
.o-word-wrap-control {
212+
.o-word-break-control {
213213
word-break: keep-all;
214-
overflow-wrap: break-word;
214+
overflow-wrap: anywhere;
215215
}
216216

217217
@media (--mobile) {

‎src/html/pages/child/index.riot

+29-25
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
11
<html lang="ja">
2-
<template is="html-base" title="{ state.title }" meta="{ state.meta }" to-root="../">
3-
<static-header></static-header>
4-
<p>page content</p>
5-
</template>
6-
<script>
7-
import HtmlBase from '../../components/html-base.riot'
8-
import StaticHeader from '../../components/static-header.riot'
9-
export default {
10-
components: {
11-
HtmlBase,
12-
StaticHeader
13-
},
14-
state: {
15-
title: 'Child page: title from props',
16-
meta: [
17-
{
18-
name: 'description',
19-
content: 'child page: description from props',
20-
},
21-
],
22-
},
23-
}
24-
</script>
25-
26-
</html>
2+
<template
3+
is="html-base"
4+
title="{ state.title }"
5+
meta="{ state.meta }"
6+
to-root="../"
7+
>
8+
<static-header></static-header>
9+
<p>page content</p>
10+
</template>
11+
<script>
12+
import HtmlBase from '../../components/html-base.riot'
13+
import StaticHeader from '../../components/static-header.riot'
14+
export default {
15+
components: {
16+
HtmlBase,
17+
StaticHeader
18+
},
19+
state: {
20+
title: 'Child page: title from props',
21+
meta: [
22+
{
23+
name: 'description',
24+
content: 'child page: description from props'
25+
}
26+
]
27+
}
28+
}
29+
</script>
30+
</html>

‎src/html/pages/child/test/index.riot

+29-25
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
11
<html lang="ja">
2-
<template is="html-base" title="{ state.title }" meta="{ state.meta }" to-root="../../">
3-
<static-header></static-header>
4-
<p>page content</p>
5-
</template>
6-
<script>
7-
import HtmlBase from '../../../components/html-base.riot'
8-
import StaticHeader from '../../../components/static-header.riot'
9-
export default {
10-
components: {
11-
HtmlBase,
12-
StaticHeader
13-
},
14-
state: {
15-
title: 'Test: title from props',
16-
meta: [
17-
{
18-
name: 'description',
19-
content: 'test: description from props',
20-
},
21-
],
22-
},
23-
}
24-
</script>
25-
26-
</html>
2+
<template
3+
is="html-base"
4+
title="{ state.title }"
5+
meta="{ state.meta }"
6+
to-root="../../"
7+
>
8+
<static-header></static-header>
9+
<p>page content</p>
10+
</template>
11+
<script>
12+
import HtmlBase from '../../../components/html-base.riot'
13+
import StaticHeader from '../../../components/static-header.riot'
14+
export default {
15+
components: {
16+
HtmlBase,
17+
StaticHeader
18+
},
19+
state: {
20+
title: 'Test: title from props',
21+
meta: [
22+
{
23+
name: 'description',
24+
content: 'test: description from props'
25+
}
26+
]
27+
}
28+
}
29+
</script>
30+
</html>

‎src/html/pages/index.riot

+33-29
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,34 @@
11
<html>
2-
<template is="html-base" title="{ state.title }" meta="{ state.meta }" to-root="./">
3-
<static-component></static-component>
4-
<static-header></static-header>
5-
<p>page content</p>
6-
<my-app data-riot></my-app>
7-
</template>
8-
<script>
9-
import HtmlBase from '../components/html-base.riot'
10-
import StaticHeader from '../components/static-header.riot'
11-
import StaticComponent from '../components/static-component.riot'
12-
export default {
13-
components: {
14-
HtmlBase,
15-
StaticHeader,
16-
StaticComponent,
17-
},
18-
state: {
19-
title: 'title from props',
20-
meta: [
21-
{
22-
name: 'description',
23-
content: 'description from props',
24-
},
25-
],
26-
},
27-
}
28-
</script>
29-
30-
</html>
2+
<template
3+
is="html-base"
4+
title="{ state.title }"
5+
meta="{ state.meta }"
6+
to-root="./"
7+
>
8+
<static-component></static-component>
9+
<static-header></static-header>
10+
<p>page content</p>
11+
<my-app data-riot></my-app>
12+
</template>
13+
<script>
14+
import HtmlBase from '../components/html-base.riot'
15+
import StaticHeader from '../components/static-header.riot'
16+
import StaticComponent from '../components/static-component.riot'
17+
export default {
18+
components: {
19+
HtmlBase,
20+
StaticHeader,
21+
StaticComponent
22+
},
23+
state: {
24+
title: 'title from props',
25+
meta: [
26+
{
27+
name: 'description',
28+
content: 'description from props'
29+
}
30+
]
31+
}
32+
}
33+
</script>
34+
</html>

0 commit comments

Comments
 (0)