@d-zero/scaffold 5.0.0-alpha.15 → 5.0.0-alpha.17

package/.husky/pre-commit

@@ -1,6 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn config set ignore-engines true
-yarn lint-staged
-yarn config set ignore-engines false
+lint-staged

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-alpha.17](https://github.com/d-zero-dev/frontend-env/compare/v5.0.0-alpha.16...v5.0.0-alpha.17) (2024-10-10)
+
+**Note:** Version bump only for package @d-zero/scaffold
+
+# [5.0.0-alpha.16](https://github.com/d-zero-dev/frontend-env/compare/v5.0.0-alpha.15...v5.0.0-alpha.16) (2024-10-09)
+
+### Bug Fixes
+
+- **scaffold:** add `--fix` option to lint commands ([78208e3](https://github.com/d-zero-dev/frontend-env/commit/78208e3bb482391c5e3fea2eb44c2447fb8f1a0f))
+
 # [5.0.0-alpha.15](https://github.com/d-zero-dev/frontend-env/compare/v5.0.0-alpha.14...v5.0.0-alpha.15) (2024-10-01)
 
 **Note:** Version bump only for package @d-zero/scaffold

package/__assets/_libs/mixin/meta.pug

@@ -17,5 +17,5 @@ mixin meta(title)
 	meta(name="twitter:image" content="__OGP用画像__")
 	link(rel="shortcut icon" href="/favicon.png")
 	link(rel="apple-touch-icon" href="/img/apple-touch-icon.png")
-	link(href="/css/style.scss" rel="stylesheet")
-	script(src="/js/script.ts" type="module")
+	link(href="/css/style.css" rel="stylesheet")
+	script(src="/js/script.js" type="module")

package/__assets/htdocs/__tmpl/index.pug

@@ -11,12 +11,6 @@ html(lang="ja")
 			.list-group-item a {
 				display: block;
 			}
-		script(type="module").
-			document.querySelectorAll("a").forEach((a) => {
-				if (a.hostname === "localhost") {
-					a.pathname = a.pathname.replace(/\.html$/, "/");
-				}
-			});
 	body
 		.c-content-main
 			main.container

package/__assets/htdocs/sub-folder.test/css/style.scss

@@ -1,7 +1,5 @@
-@charset 'utf-8';
-
-@use '../../__assets/_libs/style/base/reset';
-@use '../../__assets/_libs/style/base/root';
-@use '../../__assets/_libs/style/general/all';
-@use '../../__assets/_libs/style/general/body';
-@use '../../__assets/_libs/style/general/button';
+@import 'destyle.css' layer(reset);
+@import '@/style/base/_root.scss';
+@import '@/style/general/_all.scss';
+@import '@/style/general/_body.scss';
+@import '@/style/general/_button.scss';

package/__assets/htdocs/sub-folder.test/js/script.ts

@@ -0,0 +1,2 @@
+// eslint-disable-next-line no-console
+console.log('このスクリプトは、サブフォルダのテスト用です。');

package/eleventy.config.mjs

@@ -0,0 +1,23 @@
+import path from 'node:path';
+
+import eleventy from '@d-zero/builder/11ty';
+
+export default function (eleventyConfig) {
+	eleventyConfig.addGlobalData('alias', {
+		'@': path.resolve(import.meta.dirname, '__assets', '_libs'),
+	});
+
+	// eleventyConfig.addGlobalData('outputCssDir', 'css');
+	// eleventyConfig.addGlobalData('outputJsDir', 'js');
+	// eleventyConfig.addGlobalData('outputImgDir', 'img');
+	// eleventyConfig.addGlobalData('prettier', false);
+	/**
+	 * @see https://github.com/terser/html-minifier-terser?tab=readme-ov-file#options-quick-reference
+	 */
+	// eleventyConfig.addGlobalData('minifier', { minifyJS: false });
+	// eleventyConfig.addGlobalData('lineBreak', '\r\n');
+	// eleventyConfig.addGlobalData('charset', 'shift_jis');
+	// eleventyConfig.addGlobalData('pathFormat', 'directory');
+
+	return eleventy(eleventyConfig);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/scaffold",
-	"version": "5.0.0-alpha.15",
+	"version": "5.0.0-alpha.17",
 	"description": "Frontend scaffold files of D-ZERO Co., Ltd.",
 	"repository": "https://github.com/d-zero-dev/frontend-env.git",
 	"author": "D-ZERO Co., Ltd.",
@@ -12,14 +12,14 @@
 	"type": "module",
 	"main": "package.json",
 	"scripts": {
-		"dev": "cross-env NODE_ENV=serve build",
+		"dev": "eleventy --serve --watch",
 		"d": "yarn dev",
 		"release": "cross-env NODE_ENV=production build",
 		"lint": "run-s lint:*",
 		"lint:html": "markuplint \"./__assets/**/*.{pug,html}\"",
 		"lint:pug": "pug-lint ./__assets/htdocs/**/*.pug -r console; pug-lint ./__assets/_libs/**/*.pug -r console;",
-		"lint:css": " stylelint \"./__assets/**/*.scss\"",
-		"lint:js": " eslint \"./__assets/**/*.{js,mjs,cjs,jsx,ts,tsx}\"",
+		"lint:css": "stylelint \"./__assets/**/*.scss\" --fix",
+		"lint:js": "eslint \"./__assets/**/*.{js,mjs,cjs,jsx,ts,tsx}\" --fix",
 		"lint:format": "prettier --write \"{*,./__assets/**/*}.{js,jsx,ts,tsx,scss,pug,html,json,yaml,*rc}\"",
 		"lint:spell": "cspell --no-progress --show-suggestions \"**\"",
 		"prepare": "husky",
@@ -34,16 +34,16 @@
 		"last 2 ios_saf version"
 	],
 	"devDependencies": {
-		"@d-zero/builder": "5.0.0-alpha.15",
-		"@d-zero/linters": "5.0.0-alpha.43",
-		"@d-zero/postcss-config": "5.0.0-alpha.15",
+		"@d-zero/builder": "5.0.0-alpha.17",
+		"@d-zero/linters": "5.0.0-alpha.45",
+		"@d-zero/postcss-config": "5.0.0-alpha.17",
 		"@d-zero/tsconfig": "0.3.2",
-		"@types/node": "22.7.4",
+		"@types/node": "22.7.5",
 		"cross-env": "7.0.3",
 		"husky": "9.1.6",
 		"npm-run-all2": "6.2.3",
 		"sass": "1.79.4",
-		"typescript": "5.6.2"
+		"typescript": "5.6.3"
 	},
 	"dependencies": {
 		"destyle.css": "4.0.1",
@@ -53,5 +53,5 @@
 		"node": "22.9.0",
 		"yarn": "1.22.22"
 	},
-	"gitHead": "3f81a7c6975a37dfb3b0501da71a146ffff49077"
+	"gitHead": "8a731a43ecc817951671958444da77f97d0a0971"
 }

package/__assets/htdocs/sub-folder.test/js/script.js

@@ -1,9 +0,0 @@
-import createMainScript, { __smLte } from '../../__assets/_libs/script/index';
-
-// eslint-disable-next-line no-console
-console.log(__smLte);
-
-createMainScript(() => {
-	// eslint-disable-next-line no-console
-	console.log('このスクリプトは、サブフォルダのテスト用です。');
-});

package/eleventy.config.cjs

@@ -1,28 +0,0 @@
-const path = require('node:path');
-
-const eleventy = require('@d-zero/builder/11ty');
-
-module.exports = function (eleventyConfig) {
-	// eleventyConfig.addGlobalData('publicDir', '@static');
-	// eleventyConfig.addGlobalData('outputCssDir', 'css');
-	// eleventyConfig.addGlobalData('outputJsDir', 'js');
-	// eleventyConfig.addGlobalData('outputImgDir', 'img');
-
-	eleventyConfig.addGlobalData('alias', {
-		'@': path.resolve(__dirname, '__assets', '_libs'),
-	});
-
-	eleventyConfig.setPugOptions({
-		basedir: path.resolve(__dirname, '__assets', '_libs'),
-	});
-
-	if (process.env.NODE_ENV === 'production') {
-		eleventyConfig.addGlobalData('prettier', true);
-		// eleventyConfig.addGlobalData('minifier', { minifyJS: false });
-		// eleventyConfig.addGlobalData('lineBreak', '\r\n');
-		// eleventyConfig.addGlobalData('charset', 'shift_jis');
-		// eleventyConfig.addGlobalData('pathFormat', 'preserve');
-	}
-
-	return eleventy(eleventyConfig);
-};