Merge branch 'develop'

Author: Genki Katsutani

.gitignore

@@ -5,8 +5,8 @@ bower_components
 .DS_Store
 *.log
 .parcel-cache
-dist/**/*.html
-dist/js
-dist/css
+public/**/*.html
+public/js
+public/css
 styleguide
 src/js/components

package-lock.json

@@ -1,19 +1,19 @@
 {
   "name": "getup",
-  "version": "9.0.3",
+  "version": "10.0.0",
   "description": "Frontend boilerplate",
   "author": "nibushibu",
   "scripts": {
     "build": "cross-env NODE_ENV=production run-s html css-build js-build",
-    "css-build": "postcss src/css/main.css --env production --config postcss.config.js --output dist/css/main.css --no-map",
-    "css-develop": "postcss src/css/main.css --config postcss.config.js --output dist/css/main.css --map",
+    "css-build": "postcss src/css/main.css --env production --config postcss.config.js --output public/css/main.css --no-map",
+    "css-develop": "postcss src/css/main.css --config postcss.config.js --output public/css/main.css --map",
     "css": "npm run css-develop",
-    "html-format": "prettier 'dist/**/*.html' --ignore-path --write",
+    "html-format": "prettier 'public/**/*.html' --ignore-path --write",
     "html-from-riot": "node --loader @riotjs/register scripts/html.mjs",
     "html": "run-s html-from-riot html-format",
-    "js-build": "esbuild src/js/main.js --bundle --minify --outfile=dist/js/main.js",
-    "js": "esbuild src/js/main.js --bundle --sourcemap --outfile=dist/js/main.js",
-    "preview": "npx http-server dist -o / -c-1",
+    "js-build": "esbuild src/js/main.js --bundle --minify --outfile=public/js/main.js",
+    "js": "esbuild src/js/main.js --bundle --sourcemap --outfile=public/js/main.js",
+    "preview": "npx http-server public -o / -c-1 -d false --silent",
     "riot-single": "riot --output src/js/components --sourcemap file",
     "riot": "riot src/riot --output src/js/components --sourcemap file",
     "ready": "run-s html riot js css",
@@ -25,10 +25,10 @@
     "watch": "run-p watch:* preview"
   },
   "dependencies": {
-    "@fontsource/noto-sans-jp": "^5.0.10",
-    "animejs": "^3.2.1",
-    "open-props": "^1.5.15",
-    "riot": "^9.0.4"
+    "@fontsource/noto-sans-jp": "^5.0.17",
+    "animejs": "^3.2.2",
+    "open-props": "^1.6.16",
+    "riot": "^9.1.2"
   },
   "repository": {
     "type": "git",
@@ -44,24 +44,24 @@
     "@riotjs/register": "^9.0.0",
     "@riotjs/ssr": "^9.0.0",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.19.2",
-    "eslint": "^8.48.0",
-    "eslint-config-prettier": "^9.0.0",
-    "glob": "^10.3.4",
-    "markuplint": "^3.12.0",
+    "esbuild": "^0.19.9",
+    "eslint": "^8.55.0",
+    "eslint-config-prettier": "^9.1.0",
+    "glob": "^10.3.10",
+    "markuplint": "^3.15.0",
     "mkdirp": "^3.0.1",
     "npm-run-all": "^4.1.5",
     "onchange": "^7.1.0",
-    "postcss": "^8.4.29",
-    "postcss-cli": "^10.1.0",
+    "postcss": "^8.4.32",
+    "postcss-cli": "^11.0.0",
     "postcss-csso": "^6.0.1",
-    "postcss-custom-media": "^10.0.0",
+    "postcss-custom-media": "^10.0.2",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-import": "^15.1.0",
     "postcss-media-minmax": "^5.0.0",
     "postcss-normalize-charset": "^6.0.0",
-    "postcss-preset-env": "^9.1.3",
-    "prettier": "^3.0.3",
-    "prettier-plugin-css-order": "^2.0.0"
+    "postcss-preset-env": "^9.3.0",
+    "prettier": "^3.1.1",
+    "prettier-plugin-css-order": "^2.0.1"
   }
 }

package.json

@@ -13,6 +13,6 @@ RewriteCond %{REQUEST_FILENAME} !-f
 # 転送ルール：任意のURLを転送から除外
 # RewriteCond %{REQUEST_URI} !(^/cockpit/)
 
-# ルートディレクトリ（dist）のindex.htmlにリダイレクト
+# index.htmlにリダイレクト
 RewriteRule . /index.html [L]
 </IfModule>

dist/.htaccess public/.htaccess

@@ -5,7 +5,7 @@ import { mkdirp } from 'mkdirp'
 import render from '@riotjs/ssr'
 
 const srcDirPathFromProjectRoot = 'src/html/pages'
-const outputDir = 'dist'
+const outputDir = 'public'
 
 const files = await glob(`${srcDirPathFromProjectRoot}/**/*.riot`)
 

scripts/html.mjs

@@ -1,8 +1,8 @@
-.o-fit > *:first-child {
+.o-trim > *:first-child {
   margin-top: 0;
 }
 
-.o-fit-all *:first-child {
+.o-trim-all *:first-child {
   margin-top: 0;
 }
 

src/css/objects.css

@@ -8,7 +8,7 @@
     <meta if="{ !props.meta }" each="{ meta in state.meta }" {...meta}>
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <link rel="stylesheet" href="{ this.props.toRoot }css/main.css">
-    <script type="module" src="{ this.props.toRoot }js/main.js" defer></script>
+    <script src="{ this.props.toRoot }js/main.js" defer></script>
   </head>
 
   <body>

src/html/components/html-base.riot

@@ -1,5 +1,5 @@
 <html>
-<template is="html-base" title="{ state.title }" meta="{ state.meta }">
+<template is="html-base" title="{ state.title }" meta="{ state.meta }" to-root="./">
   <static-component></static-component>
   <static-header></static-header>
   <p>page content</p>