@d-zero/scaffold 5.0.0-alpha.14 → 5.0.0-alpha.3

package/.eslintrc.cjs

@@ -1,4 +1,3 @@
 module.exports = {
 	extends: ['@d-zero/eslint-config'],
-	ignorePatterns: ['@static'],
 };

package/.stylelintrc

@@ -1,20 +1,3 @@
 {
-	"extends": ["@d-zero/stylelint-config"],
-	"overrides": [
-		{
-			"files": ["_c-*.scss"],
-			"rules": {
-				"@d-zero/component": {
-					"allowMultipleSelectors": true
-				}
-			}
-		},
-		{
-			"files": ["_c-content-main.scss"],
-			"rules": {
-				"selector-class-pattern": null,
-				"selector-nested-pattern": "^(?!\\.c-).*"
-			}
-		}
-	]
+	"extends": ["@d-zero/stylelint-config"]
 }

package/CHANGELOG.md

@@ -3,75 +3,6 @@
 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.14](https://github.com/d-zero-dev/frontend-env/compare/v5.0.0-alpha.13...v5.0.0-alpha.14) (2024-07-31)
-
-### Features
-
-- **builder:** css,js,画像ファイルのアウトプット先ディレクトリを指定できるようにする ([bd6028b](https://github.com/d-zero-dev/frontend-env/commit/bd6028b501c872e5667878b754f48938db39e130))
-
-# [5.0.0-alpha.13](https://github.com/d-zero-dev/frontend-env/compare/v5.0.0-alpha.12...v5.0.0-alpha.13) (2024-07-22)
-
-**Note:** Version bump only for package @d-zero/scaffold
-
-# [5.0.0-alpha.12](https://github.com/d-zero-dev/frontend-env/compare/v5.0.0-alpha.11...v5.0.0-alpha.12) (2024-07-05)
-
-### Bug Fixes
-
-- **scaffold:** fix ignore path within lint-staged ([c62c532](https://github.com/d-zero-dev/frontend-env/commit/c62c5327bd7f142960950fbe4300905301d34a6f))
-
-# [5.0.0-alpha.11](https://github.com/d-zero-dev/frontend-env/compare/v5.0.0-alpha.10...v5.0.0-alpha.11) (2024-07-05)
-
-### Bug Fixes
-
-- **repo:** fix deprecated husky command on prepare script ([d72833b](https://github.com/d-zero-dev/frontend-env/commit/d72833bcc90cdf3abb649a5e865551fadccf72ee))
-- **scaffold:** fix to ignore `htdocs` on lint staged process ([8292cc9](https://github.com/d-zero-dev/frontend-env/commit/8292cc90098076ad613c33162610e8536bd89ff7))
-
-### Features
-
-- **scaffold:** 301_form_confirmテンプレートに「入力画面に戻る」ボタンを追加 ([7aa3614](https://github.com/d-zero-dev/frontend-env/commit/7aa3614ffd8f1e7cebe64c97428c0d830f9abb70))
-- **scaffold:** add `@d-zero/component` stylelint rule ([7c42f10](https://github.com/d-zero-dev/frontend-env/commit/7c42f10fc01edf42082844c5334447025cc81bda))
-- **scaffold:** huskyの追加 ([7f485dc](https://github.com/d-zero-dev/frontend-env/commit/7f485dcb28cfaf5ff78eec9e93bcd0a56ff52b95))
-
-# [5.0.0-alpha.10](https://github.com/d-zero-dev/frontend-env/compare/v5.0.0-alpha.9...v5.0.0-alpha.10) (2024-06-11)
-
-### Bug Fixes
-
-- **scaffold:** 生成ファイルや静的ファイルがリント対象となっていたため除外設定を追加 ([0938636](https://github.com/d-zero-dev/frontend-env/commit/0938636ec260337914eaa4d0ab98aead709164fc))
-- **scaffold:** 文字選択の背景色が表示できない設定になっていたので削除 ([5b7a559](https://github.com/d-zero-dev/frontend-env/commit/5b7a559adb103a868901cfe7ab8dc7ef2f5d5e12))
-
-### Features
-
-- **scaffold:** リセットを`destyle.css`に変更 ([10f05c7](https://github.com/d-zero-dev/frontend-env/commit/10f05c79f54b41114c3d26194ad1ba84b15fd61d))
-
-# [5.0.0-alpha.9](https://github.com/d-zero-dev/frontend-env/compare/v5.0.0-alpha.8...v5.0.0-alpha.9) (2024-06-10)
-
-### Features
-
-- **builder:** `publicDir`を`eleventyConfig.addGlobalData`に設定できるように追加 ([26e2740](https://github.com/d-zero-dev/frontend-env/commit/26e2740c8df32cc60cb4e407fe4cfc20919a7e5a))
-- **scaffold:** `[@static](https://github.com/static)`フォルダを空フォルダとして予め準備 ([7fe485b](https://github.com/d-zero-dev/frontend-env/commit/7fe485b2ef4d5a13e23e494c1d2c5422ef3fdc3b))
-
-# [5.0.0-alpha.8](https://github.com/d-zero-dev/frontend-env/compare/v5.0.0-alpha.7...v5.0.0-alpha.8) (2024-05-23)
-
-**Note:** Version bump only for package @d-zero/scaffold
-
-# [5.0.0-alpha.7](https://github.com/d-zero-dev/frontend-env/compare/v5.0.0-alpha.6...v5.0.0-alpha.7) (2024-05-14)
-
-**Note:** Version bump only for package @d-zero/scaffold
-
-# [5.0.0-alpha.6](https://github.com/d-zero-dev/frontend-env/compare/v5.0.0-alpha.5...v5.0.0-alpha.6) (2024-05-14)
-
-**Note:** Version bump only for package @d-zero/scaffold
-
-# [5.0.0-alpha.5](https://github.com/d-zero-dev/frontend-env/compare/v5.0.0-alpha.4...v5.0.0-alpha.5) (2024-05-14)
-
-### Bug Fixes
-
-- **scaffold:** fix published files ([f35ae2b](https://github.com/d-zero-dev/frontend-env/commit/f35ae2b9c46f14efda206acf518d10bd3b4a582f))
-
-# [5.0.0-alpha.4](https://github.com/d-zero-dev/frontend-env/compare/v5.0.0-alpha.2...v5.0.0-alpha.4) (2024-05-14)
-
-**Note:** Version bump only for package @d-zero/scaffold
-
 # [5.0.0-alpha.2](https://github.com/d-zero-dev/frontend-env/compare/v5.0.0-alpha.1...v5.0.0-alpha.2) (2024-05-14)
 
 ### Bug Fixes

package/__assets/_libs/component/_c-content-main.scss

@@ -1,7 +1,7 @@
 @use '../style/theme' as *;
 
-// 🃏 このファイルのStylelintルールはoverridesによって特別に変更されています
-
+/* stylelint-disable selector-class-pattern, selector-nested-pattern -- content-main特殊ルール */
+//
 // メインコンテンツ（content-mainコンポーネント）の内容はCMSなどで管理されるHTMLを含んだり、
 // ページ独自のスタイルを扱うことが多いので例外的に専用のルールを設ける。
 //
@@ -267,3 +267,4 @@
 		}
 	}
 }
+/* stylelint-enable selector-class-pattern, selector-nested-pattern */

package/__assets/_libs/style/general/_all.scss

@@ -7,5 +7,9 @@
 	&::after {
 		box-sizing: border-box;
 	}
+
+	&::selection {
+		background-color: initial;
+	}
 }
 /* stylelint-enable selector-max-universal */

package/cspell.json

@@ -1,4 +1,3 @@
 {
-	"import": ["@d-zero/cspell-config"],
-	"ignorePaths": ["./htdocs", "**/@static/**/*"]
+	"import": ["@d-zero/cspell-config"]
 }

package/eleventy.config.cjs

@@ -3,19 +3,10 @@ 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 });

package/lint-staged.config.mjs

@@ -1,12 +1,3 @@
-import path from 'node:path';
-
 // eslint-disable-next-line import/no-extraneous-dependencies
 import lintStagedConfigGenerator from '@d-zero/lint-staged-config';
-export default lintStagedConfigGenerator({
-	ignore: [
-		path.resolve(process.cwd(), 'htdocs', '**', '*'),
-		{
-			textlint: 'CHANGELOG.md',
-		},
-	],
-});
+export default lintStagedConfigGenerator();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/scaffold",
-	"version": "5.0.0-alpha.14",
+	"version": "5.0.0-alpha.3",
 	"description": "Frontend scaffold files of D-ZERO Co., Ltd.",
 	"repository": "https://github.com/d-zero-dev/frontend-env.git",
 	"author": "D-ZERO Co., Ltd.",
@@ -11,18 +11,27 @@
 	},
 	"type": "module",
 	"main": "package.json",
+	"files": [
+		"*",
+		"**/*",
+		".gitignore",
+		"!htdocs",
+		"!node_modules",
+		"!.11ty-vite",
+		"!.serve",
+		"!.DS_Store"
+	],
 	"scripts": {
 		"dev": "cross-env NODE_ENV=serve build",
 		"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:html: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:format": "prettier --write \"{*,./__assets/**/*}.{js,jsx,ts,tsx,scss,pug,html,json,yaml,*rc}\"",
+		"lint:format": "prettier --write \"./__assets/**/*.{js,jsx,ts,tsx,scss,pug,html}\"",
 		"lint:spell": "cspell --no-progress --show-suggestions \"**\"",
-		"prepare": "husky",
 		"up": "yarn upgrade-interactive --latest"
 	},
 	"browserslist": [
@@ -34,24 +43,22 @@
 		"last 2 ios_saf version"
 	],
 	"devDependencies": {
-		"@d-zero/builder": "5.0.0-alpha.14",
-		"@d-zero/linters": "5.0.0-alpha.41",
-		"@d-zero/postcss-config": "5.0.0-alpha.14",
-		"@d-zero/tsconfig": "0.3.1",
-		"@types/node": "20.14.13",
+		"@d-zero/builder": "5.0.0-alpha.2",
+		"@d-zero/linters": "5.0.0-alpha.25",
+		"@d-zero/postcss-config": "5.0.0-alpha.2",
+		"@d-zero/tsconfig": "0.2.0",
+		"@types/node": "20.12.12",
 		"cross-env": "7.0.3",
-		"husky": "9.1.4",
-		"npm-run-all2": "6.2.2",
-		"sass": "1.77.8",
-		"typescript": "5.5.4"
+		"npm-run-all2": "6.1.2",
+		"sass": "1.77.1",
+		"typescript": "5.4.5"
 	},
 	"dependencies": {
-		"destyle.css": "4.0.1",
-		"tslib": "2.6.3"
+		"ress": "5.0.2",
+		"tslib": "2.6.2"
 	},
 	"volta": {
-		"node": "22.5.1",
+		"node": "22.1.0",
 		"yarn": "1.22.22"
-	},
-	"gitHead": "6ce96d0c6b7b409008b927e293ceddeef5b4ca85"
+	}
 }

package/.husky/pre-commit

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

package/.prettierignore

@@ -1 +0,0 @@
-@static

package/.textlintignore

@@ -1 +0,0 @@
-CHANGELOG.md

package/__assets/htdocs/.eslintrc

@@ -1,10 +0,0 @@
-{
-	"extends": ["../../.eslintrc.cjs"],
-	"env": {
-		"node": false,
-		"browser": true,
-		"jquery": true,
-		"es6": true,
-		"commonjs": true
-	}
-}

package/__assets/htdocs/__tmpl/.markuplintrc

@@ -1,19 +0,0 @@
-{
-	"extends": ["../../../.markuplintrc"],
-	"nodeRules": [
-		{
-			"selector": "link, script",
-			"rules": {
-				"invalid-attr": {
-					"options": {
-						"allowAttrs": {
-							"⚠️": {
-								"type": "Any"
-							}
-						}
-					}
-				}
-			}
-		}
-	]
-}

package/__assets/htdocs/__tmpl/000_home.pug

@@ -1,20 +0,0 @@
-html(lang="ja")
-	head
-		include /mixin/meta.pug
-		+meta('__サイトタイトル__')
-	body.c-page-home
-		.c-page-home__base
-			.c-page-home__header
-				- const isHome = true;
-				include /component/_c-header.pug
-			.c-page-home__nav-global
-				include /component/_c-nav-global.pug
-
-			.c-page-home__main
-				main
-					h2 メイン
-
-			.c-page-home__nav-sitemap
-				include /component/_c-nav-sitemap.pug
-			.c-page-home__footer
-				include /component/_c-footer.pug

package/__assets/htdocs/__tmpl/100_sub.pug

@@ -1,23 +0,0 @@
-html(lang="ja")
-	head
-		include /mixin/meta.pug
-		+meta('__ページタイトル__ | __サイトタイトル__')
-	body.c-page-sub
-		.c-page-sub__base
-			.c-page-sub__header
-				include /component/_c-header.pug
-			.c-page-sub__nav-global
-				include /component/_c-nav-global.pug
-			.c-page-sub__main
-				main
-					article.c-page-sub__content
-						.c-page-sub__title-page
-							include /component/_c-title-page.pug
-						.c-page-sub__nav-breadcrumb
-							include /component/_c-nav-breadcrumb.pug
-						.c-page-sub__content-main
-							.c-content-main !{ blocks }
-			.c-page-sub__nav-sitemap
-				include /component/_c-nav-sitemap.pug
-			.c-page-sub__footer
-				include /component/_c-footer.pug

package/__assets/htdocs/__tmpl/200_blog_index.pug

@@ -1,40 +0,0 @@
-html(lang="ja")
-	head
-		include /mixin/meta.pug
-		+meta('__ページタイトル__ | __サイトタイトル__')
-	body.c-page-sub
-		.c-page-sub__base
-			.c-page-sub__header
-				include /component/_c-header.pug
-			.c-page-sub__nav-global
-				include /component/_c-nav-global.pug
-
-			.c-page-sub__main
-				main
-					article.c-page-sub__content
-						.c-page-sub__title-page
-							include /component/_c-title-page.pug
-						.c-page-sub__nav-breadcrumb
-							include /component/_c-nav-breadcrumb.pug
-						.c-page-sub__content-index
-							.c-content-index
-								.c-content-index__categories
-									// ⚠️ CMS要件:
-									// - ページがカテゴリーインデックスの場合は aria-current="page" を付加する
-									// - カテゴリーインデックスではなく、カテゴリーに属するページでは aria-current="page" は付加しない
-									ul
-										li: a(href="__PATH_TO__"): span ALL
-										li: a(href="__PATH_TO__" aria-current="page"): span カテゴリー1
-										li: a(href="__PATH_TO__"): span カテゴリー2
-										li: a(href="__PATH_TO__"): span カテゴリー3
-								.c-content-index__body
-									.c-media-list
-										each article in data.articles
-											include /component/_c-media.pug
-						.c-page-sub__pagination
-							include /component/_c-pagination.pug
-
-			.c-page-sub__nav-sitemap
-				include /component/_c-nav-sitemap.pug
-			.c-page-sub__footer
-				include /component/_c-footer.pug

package/__assets/htdocs/__tmpl/210_blog_index.pug

@@ -1,40 +0,0 @@
-html(lang="ja")
-	head
-		include /mixin/meta.pug
-		+meta('__ページタイトル__ | __サイトタイトル__')
-	body.c-page-sub
-		.c-page-sub__base
-			.c-page-sub__header
-				include /component/_c-header.pug
-			.c-page-sub__nav-global
-				include /component/_c-nav-global.pug
-
-			.c-page-sub__main
-				main
-					article.c-page-sub__content
-						.c-page-sub__title-page
-							include /component/_c-title-page.pug
-						.c-page-sub__nav-breadcrumb
-							include /component/_c-nav-breadcrumb.pug
-						.c-page-sub__content-index
-							.c-content-index
-								.c-content-index__categories
-									// ⚠️ CMS要件:
-									// - ページがカテゴリーインデックスの場合は aria-current="page" を付加する
-									// - カテゴリーインデックスではなく、カテゴリーに属するページでは aria-current="page" は付加しない
-									ul
-										li: a(href="__PATH_TO__"): span ALL
-										li: a(href="__PATH_TO__" aria-current="page"): span カテゴリー1
-										li: a(href="__PATH_TO__"): span カテゴリー2
-										li: a(href="__PATH_TO__"): span カテゴリー3
-								.c-content-index__body
-									.c-card-list
-										each article in data.articles
-											include /component/_c-card.pug
-						.c-page-sub__pagination
-							include /component/_c-pagination.pug
-
-			.c-page-sub__nav-sitemap
-				include /component/_c-nav-sitemap.pug
-			.c-page-sub__footer
-				include /component/_c-footer.pug