Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lint-staged
37 changes: 37 additions & 0 deletions biome.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"$schema": "https://biomejs.dev/schemas/2.1.2/schema.json",
"vcs": {
"enabled": true,
"clientKind": "git",
"useIgnoreFile": true
},
"files": {
"ignoreUnknown": false,
"includes": ["**", "!**/generated/**"]
},
"formatter": {
"enabled": true,
"indentStyle": "space",
"indentWidth": 2
},
"linter": {
"enabled": true,
"rules": {
"recommended": true
}
},
"javascript": {
"formatter": {
"quoteStyle": "single",
"trailingCommas": "es5"
}
},
"assist": {
"enabled": true,
"actions": {
"source": {
"organizeImports": "on"
}
}
}
}
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ node {
}

tasks.register('buildFrontend', PnpmTask) {
args = ['build:packages']
args = ['build']
dependsOn('installDepsForUI')
}

Expand All @@ -48,5 +48,5 @@ build {
}

halo {
version = "2.20"
version = "2.21"
}
23 changes: 17 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"license": "GPL-3.0",
"author": {
"name": "Halo OSS Team",
"name": "Halo",
"url": "https://github.com/halo-dev"
},
"contributors": [
Expand All @@ -12,19 +12,30 @@
}
],
"scripts": {
"build:packages": "pnpm --filter \"./packages/**\" build",
"example:dev": "pnpm --filter \"./packages/search-widget\" dev",
"release:packages": "pnpm --filter \"./packages/**\" release"
"build": "pnpm -r run build",
"check": "biome check --write",
"example:dev": "pnpm -C packages/search-widget dev",
"prepare": "husky",
"release:packages": "pnpm -r run release"
},
"lint-staged": {
"*": [
"biome check --no-errors-on-unmatched --files-ignore-unknown=true"
]
},
"devDependencies": {
"@biomejs/biome": "^2.1.2",
"@halo-dev/api-client": "2.17.0",
"@rushstack/eslint-patch": "^1.10.4",
"@types/node": "^18.19.43",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"eslint": "^8.57.0",
"husky": "^9.1.7",
"lint-staged": "^16.1.2",
"prettier": "^2.8.8",
"typescript": "^5.5.4",
"vite": "^5.3.5"
}
"vite": "npm:[email protected]"
},
"packageManager": "[email protected]+sha512.d615db246fe70f25dcfea6d8d73dee782ce23e2245e3c4f6f888249fb568149318637dca73c2c5c8ef2a4ca0d5657fb9567188bfab47f566d1ee6ce987815c39"
}
18 changes: 0 additions & 18 deletions packages/search-widget/.eslintrc.json

This file was deleted.

28 changes: 0 additions & 28 deletions packages/search-widget/.gitignore

This file was deleted.

7 changes: 0 additions & 7 deletions packages/search-widget/.prettierrc.json

This file was deleted.

32 changes: 14 additions & 18 deletions packages/search-widget/lit-localize.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
{
"$schema": "https://raw.githubusercontent.com/lit/lit/main/packages/localize-tools/config.schema.json",
"sourceLocale": "en",
"targetLocales": [
"es",
"zh-CN",
"zh-TW"
],
"tsConfig": "./tsconfig.json",
"output": {
"mode": "runtime",
"outputDir": "./src/generated/locales",
"localeCodesModule": "./src/generated/locale-codes.ts"
},
"interchange": {
"format": "xliff",
"xliffDir": "./xliff/"
}
}
"$schema": "https://raw.githubusercontent.com/lit/lit/main/packages/localize-tools/config.schema.json",
"sourceLocale": "en",
"targetLocales": ["es", "zh-CN", "zh-TW"],
"tsConfig": "./tsconfig.json",
"output": {
"mode": "runtime",
"outputDir": "./src/generated/locales",
"localeCodesModule": "./src/generated/locale-codes.ts"
},
"interchange": {
"format": "xliff",
"xliffDir": "./xliff/"
}
}
13 changes: 6 additions & 7 deletions packages/search-widget/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,18 @@
},
"dependencies": {
"@lit/localize": "^0.12.2",
"es-toolkit": "^1.39.7",
"lit": "^3.2.0",
"lodash-es": "^4.17.21",
"overlayscrollbars": "^2.10.0"
},
"devDependencies": {
"@iconify/json": "^2.2.234",
"@julr/unocss-preset-forms": "^0.1.0",
"@julr/unocss-preset-forms": "^2.0.0",
"@lit/localize-tools": "^0.8.0",
"@types/lodash-es": "^4.17.12",
"@unocss/eslint-config": "^0.61.9",
"@unocss/reset": "^0.61.9",
"@unocss/reset": "^66.3.3",
"lit-analyzer": "^1.2.1",
"unocss": "^0.61.9",
"vite-plugin-dts": "4.0.0-beta.2"
"unocss": "^66.3.3",
"vite-plugin-dts": "4.0.0-beta.2",
"vite": "npm:[email protected]"
}
}
2 changes: 1 addition & 1 deletion packages/search-widget/src/constants/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export const HISTORY_KEY = 'halo:search-widgets:history:hits';
export const MAX_HISTORY_ITEMS = 50;
export const MAX_HISTORY_ITEMS = 50;
10 changes: 7 additions & 3 deletions packages/search-widget/src/locale/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { configureLocalization, LocaleModule } from '@lit/localize';
import { configureLocalization, type LocaleModule } from '@lit/localize';
import {
allLocales,
sourceLocale,
targetLocales,
} from '../generated/locale-codes';
import * as templates_es from '../generated/locales/es';
import * as templates_zh_CN from '../generated/locales/zh-CN';
import * as templates_zh_TW from '../generated/locales/zh-TW';
import { allLocales, sourceLocale, targetLocales } from '../generated/locale-codes';

const localizedTemplates = new Map([
['es', templates_es],
Expand All @@ -19,7 +23,7 @@ const { setLocale } = configureLocalization({
setLocale(getLocale());

function getLanguageFromCookie() {
const match = document.cookie.match(new RegExp('(^| )language=([^;]+)'));
const match = document.cookie.match(/(^| )language=([^;]+)/);
const matchedLanguage = allLocales.find((locale) => locale === match?.[2]);
return matchedLanguage;
}
Expand Down
Loading
Loading