Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e66ec35
chore: @cspell/dict-software-terms を導入
blendthink May 14, 2025
7900624
chore: cspell.jsonc に $schema を設定
blendthink May 14, 2025
c9abce7
fix: CSpell の language 設定を修正
blendthink May 14, 2025
549861f
chore: useGitignore を有効化
blendthink May 14, 2025
3d7506a
chore: `enableGlobDot` を有効化
blendthink May 14, 2025
7a5ef3a
chore: `files` を指定して対象となるファイルを制限
blendthink May 14, 2025
371222c
chore: VSCode の推奨拡張機能に `streetsidesoftware.code-spell-checker` を追加
blendthink May 14, 2025
6734f79
chore: yumemiをプロジェクト固有の用語として追加
blendthink May 14, 2025
12d1229
chore: cspellにプロジェクト固有の用語辞書を設定
blendthink May 14, 2025
adf71db
chore: Flutter固有の用語辞書を追加
blendthink May 14, 2025
84575b2
chore: cspellにFlutter固有の用語辞書を設定
blendthink May 14, 2025
0ac8925
chore: iOS用語辞書を追加
blendthink May 14, 2025
a9f3efc
chore: GitHub Actions用語辞書を追加
blendthink May 14, 2025
5566f49
chore: designsystemをプロジェクト用語に追加
blendthink May 14, 2025
2429b5f
chore: dcarboneをGitHub Actions用語に追加
blendthink May 14, 2025
9dedc0e
chore: ラベル定義ファイルをcspellの無視対象に追加
blendthink May 14, 2025
34883f1
fix: pubspeck.lockの誤字を修正
blendthink May 14, 2025
c7858e4
fix: dynamiの誤字を修正
blendthink May 14, 2025
d9c32ac
fix: formattedGeneratContentの誤字を修正
blendthink May 14, 2025
5e6a5fc
fix: TargetPlartformの誤字を修正
blendthink May 14, 2025
42999cc
chore: DavidAnsonをGitHub Actions用語に追加
blendthink May 14, 2025
e0432d2
fix: custom_app_lifecyle_listernerの誤字を修正
blendthink May 14, 2025
20c54c7
refactor: 変数名をより具体的な名前に変更
blendthink May 14, 2025
4528e04
refactor: _saveThemeModeメソッド内の変数名をより具体的な名前に変更
blendthink May 14, 2025
25f5db5
chore: Git用語辞書を追加
blendthink May 14, 2025
4af45a0
fix: melos run gen:build を実行
blendthink May 14, 2025
e8474cb
chore: dart,flutter辞書の設定を修正する
fa0311 May 15, 2025
5743576
chore: 辞書を追加
fa0311 May 15, 2025
d750d99
Merge branch 'main' into chore/GH-384-plus
blendthink May 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .cspell/docs-term.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
firebaserc
gifs
Angelov
Empty file added .cspell/flutter-term.txt
Empty file.
1 change: 1 addition & 0 deletions .cspell/git-term.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
toplevel
12 changes: 12 additions & 0 deletions .cspell/github-action-term.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
andstor
DavidAnson
dcarbone
dorny
ghaction
hkusu
mikefarah
nofilter
reviewdog
srvaroa
startswith
webframeworks
2 changes: 2 additions & 0 deletions .cspell/ios-term.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
xcassets
xcworkspace
2 changes: 2 additions & 0 deletions .cspell/project-term.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
designsystem
yumemi
4 changes: 2 additions & 2 deletions .github/workflows/wc-check-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
diff=$(dart run ./tools/diff_yaml.dart $baseRefName pubspec.yaml pubspec.lock)

if [ -z "$diff" ]; then
echo "No change in pubspeck.lock"
echo "No change in pubspec.lock"
else
echo "There is a change in pubspeck.lock."
echo "There is a change in pubspec.lock."

path="$GITHUB_WORKSPACE/$(date +%Y%m%d%H%M%S)"
echo "$diff" > "$path"
Expand Down
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"DavidAnson.vscode-markdownlint",
"google.arb-editor",
"hverlin.mise-vscode",
"oven.bun-vscode"
"oven.bun-vscode",
"streetsidesoftware.code-spell-checker"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import 'package:widgetbook_annotation/widgetbook_annotation.dart';
Widget circularProgressIndicator(BuildContext context) =>
const CircularProgressIndicator();

/// TargetPlartformで表示が変わるサンプル
/// TargetPlatform で表示が変わるサンプル
@UseCase(
name: 'CircularProgressIndicatorAdaptive',
type: CircularProgressIndicator,
Expand Down
5 changes: 4 additions & 1 deletion bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

76 changes: 68 additions & 8 deletions cspell.jsonc
Original file line number Diff line number Diff line change
@@ -1,17 +1,77 @@
{
"$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
"version": "0.2",
"language": [
"en",
"ja"
"language": "en,ja",
"useGitignore": true,
"enableGlobDot": true,
"files": [
"**/*.{md,yaml,yml,dart}"
],
"overrides": [
{
"filename": "**/*.{md,yaml,yml,dart}",
"dictionaries": ["dart", "flutter"]
}
],
Comment on lines +10 to +15

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dart, flutter辞書はdart言語扱いのファイル(*.dart)にしか適用されないので上書きします

"ignoreRegExpList": [
// https://github.com/dart-lang/sdk/blob/main/pkg/analyzer/lib/src/dart/error/todo_codes.dart
"(TODO|FIXME|HACK|UNDONE)\\([^)]*\\)"
Comment on lines +17 to +18

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good-badge
🫶

],
"ignorePaths": [
"cspell.jsonc",
// IDE関連
".idea",
".vscode",
// 自動生成ファイル
"*.*.dart",
// ラベル定義(カラーコードで警告が出るため)
".github/labels.yml"
],
"dictionaryDefinitions": [
{
"name": "docs-term",
"description": "Docs related terms",
"path": "./.cspell/docs-term.txt",
"addWords": true,
},
{
"name": "flutter-term",
"description": "Flutter related terms",
"path": "./.cspell/flutter-term.txt",

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dart 辞書にはpubdevの上位100件のパッケージ名が含まれており、今回使用されているパッケージは全て含まれていたため空になりました
ですが、念の為残しております

"addWords": true,
},
{
"name": "git-term",
"description": "Git related terms",
"path": "./.cspell/git-term.txt",
"addWords": true,
},
{
"name": "github-action-term",
"description": "GitHub Actions related terms",
"path": "./.cspell/github-action-term.txt",
"addWords": true,
},
{
"name": "ios-term",
"description": "iOS related terms",
"path": "./.cspell/ios-term.txt",
"addWords": true,
},
{
"name": "project-term",
"description": "Project related terms",
"path": "./.cspell/project-term.txt",
"addWords": true,
}
],
"dictionaries": [
"docs-term",
"flutter-term",
"git-term",
"github-action-term",
"ios-term",
"project-term"
],
"import": [
"@cspell/dict-dart/cspell-ext.json",
"@cspell/dict-flutter/cspell-ext.json"
"@cspell/dict-flutter/cspell-ext.json",
"@cspell/dict-software-terms/cspell-ext.json"
]
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"devDependencies": {
"@cspell/dict-dart": "^2.3.0",
"@cspell/dict-flutter": "^1.1.0",
"@cspell/dict-software-terms": "^5.0.8",
"cspell": "^8.19.2"
}
}
2 changes: 1 addition & 1 deletion packages/cores/core/lib/util.dart
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export 'src/util/custom_app_lifecyle_listerner.dart';
export 'src/util/custom_app_lifecycle_listener.dart';
export 'src/util/logger.dart';
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ class ThemeModeNotifier extends _$ThemeModeNotifier {
}

ThemeMode _getThemeMode() {
final prefs = ref.watch(sharedPreferencesProvider);
final themeIndex = prefs.getInt(SharedPreferencesKeys.themeMode.name);
final sharedPreferences = ref.watch(sharedPreferencesProvider);
final themeIndex = sharedPreferences.getInt(
SharedPreferencesKeys.themeMode.name,
);
return ThemeMode.values.singleWhere(
(themeMode) => themeMode.index == themeIndex,
orElse: () => ThemeMode.system,
Expand All @@ -27,7 +29,10 @@ class ThemeModeNotifier extends _$ThemeModeNotifier {
}

Future<void> _saveThemeMode(int themeIndex) async {
final prefs = ref.read(sharedPreferencesProvider);
await prefs.setInt(SharedPreferencesKeys.themeMode.name, themeIndex);
final sharedPreferences = ref.read(sharedPreferencesProvider);
await sharedPreferences.setInt(
SharedPreferencesKeys.themeMode.name,
themeIndex,
);
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tools/diff_yaml.dart
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ Iterable<Map<String, String>> diffPkgVersion(
);
}

/// Compares Maps and returns a [Map<String, dynami>] of the elements
/// Compares Maps and returns a [Map<String, dynamic>] of the elements
/// that differ between [previous] and [current].

Map<String, dynamic> compareMap(
Expand Down
10 changes: 5 additions & 5 deletions tools/gen_labeler.dart
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,18 @@ String _generateLabelerContent({
final melosPackageLabelersString = melosPackageLabelersYamlEditor.toString();

// NOTE: 視認性向上のため YAML 要素間に改行を加える
final formattedGeneratContent = <String>[' $autoGeneratedLabelComment'];
final formattedGenerateContent = <String>[' $autoGeneratedLabelComment'];
for (final line in melosPackageLabelersString.split('\n')) {
if (line.startsWith('labels:')) {
continue;
}
if (line.startsWith(' -') && formattedGeneratContent.length != 1) {
formattedGeneratContent.add('');
if (line.startsWith(' -') && formattedGenerateContent.length != 1) {
formattedGenerateContent.add('');
}
formattedGeneratContent.add(line.replaceAll(r'\/', '/'));
formattedGenerateContent.add(line.replaceAll(r'\/', '/'));
}

return formattedGeneratContent.join('\n');
return formattedGenerateContent.join('\n');
}

extension on List<MelosPackage> {
Expand Down