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
4 changes: 4 additions & 0 deletions .github/workflows/lint-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,9 @@ jobs:
- name: OXLint
run: pnpm lint

# to be removed later once oxlint jsPlugins issue is resolved
- name: OXLint Angular-Slickgrid
run: pnpm angular:lint

- name: Prettier
run: pnpm prettier:check
2 changes: 1 addition & 1 deletion .oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"browser": true,
"shared-node-browser": true
},
"ignorePatterns": ["**/*.{js,mjs,d.ts}", "**/dist/**", "**/demos/angular/**", "**/frameworks/angular-slickgrid/**", "**/*.d.ts"],
"ignorePatterns": ["**/*.{js,mjs,d.ts}", "**/dist/**", "**/frameworks/angular-slickgrid/**", "**/*.d.ts"],
"overrides": [
{
"files": ["**/*.spec.ts"],
Expand Down
66 changes: 0 additions & 66 deletions frameworks/angular-slickgrid/.oxlintrc.json

This file was deleted.

55 changes: 55 additions & 0 deletions frameworks/angular-slickgrid/oxlintrc-angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"$schema": "../../node_modules/oxlint/configuration_schema.json",
"env": {
"es2025": true,
"browser": true,
"shared-node-browser": true
},
"plugins": ["oxc", "regex", "typescript", "vitest"],
"jsPlugins": ["@angular-eslint/eslint-plugin"],
"ignorePatterns": [
"**/*.spec.ts",
"**/*.cy.ts",
".angular/*",
"dist/",
"coverage/",
"test/",
"**/environment.*.ts",
"**/grid-remote.component.ts",
"**/public_api.ts"
],
"overrides": [
{
"files": ["**/*.ts"],
"rules": {
"typescript/consistent-type-imports": "off"
}
}
],
"rules": {
"@angular-eslint/directive-selector": ["error", { "type": "attribute", "prefix": "app", "style": "camelCase" }],
"@angular-eslint/component-selector": ["error", { "type": "element", "style": "kebab-case" }],
"@angular-eslint/prefer-standalone": "off",
"typescript/no-unused-expressions": "off",
"typescript/no-unused-vars": [
"error",
{
"argsIgnorePattern": "^_",
"destructuredArrayIgnorePattern": "^_",
"caughtErrors": "none"
}
],
"naming-convention": [
"error",
{
"selector": "directive",
"format": ["camelCase"],
"prefix": ["app"]
},
{
"selector": "component",
"format": ["kebab-case"]
}
]
}
}
6 changes: 2 additions & 4 deletions frameworks/angular-slickgrid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,13 @@
"angular:dev": "ng serve --port 4300",
"angular:cypress": "cypress open --config-file test/cypress.config.ts",
"angular:preview": "vite preview --outDir=website --port=4300",
"prebuild": "pnpm lint",
"build": "pnpm packagr",
"postbuild": "pnpm run copy:i18n",
"packagr": "ng-packagr -p ng-package.json -c tsconfig.json",
"copy:i18n": "copyfiles src/assets/i18n/*.json dist/i18n --flat --stat",
"delete:dist": "remove dist",
"build:demo": "ng build --configuration=production --base-href=''",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
"lint:no-cache": "oxlint .",
"lint": "oxlint . -c oxlintrc-angular.json --threads 1",
"pack-tarball": "npm pack",
"pack-lib": "npm pack ./dist",
"replace-workspace": "node ./scripts/replace-workspace.mjs",
Expand Down Expand Up @@ -71,6 +68,7 @@
"@analogjs/vite-plugin-angular": "^1.22.5",
"@analogjs/vitest-angular": "^1.22.5",
"@angular-devkit/build-angular": "^19.2.19",
"@angular-eslint/eslint-plugin": "^20.5.1",
"@angular/animations": "^19.2.15",
"@angular/build": "19.2.19",
"@angular/cli": "^19.2.19",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ export class CustomInputFilter implements Filter {
});
this.filterElm?.classList.remove('filled');
} else {
value === '' ? this.filterElm?.classList.remove('filled') : this.filterElm?.classList.add('filled');
const action = value === '' ? 'remove' : 'add';
this.filterElm?.classList[action]('filled');
this.callback(e, { columnDef: this.columnDef, searchTerms: [value], shouldTriggerQuery: this._shouldTriggerQuery });
}
// reset both flags for next use
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export class Logger {
if (typeof message === 'object') {
try {
message = JSON.stringify(message, null, 2);
} catch (e: any) {
} catch (_e) {
additional = [message, ...additional];
message = 'circular object in message. ';
}
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"angular:build:framework": "pnpm -r --stream --filter=angular-slickgrid run build",
"angular:build:demo": "pnpm -r --stream --filter=angular-slickgrid run build:demo",
"angular:cypress": "pnpm -r --stream --filter=angular-slickgrid run angular:cypress",
"angular:lint": "pnpm -r --stream --filter=angular-slickgrid run lint",
"angular:serve": "pnpm -r --stream --filter=angular-slickgrid run angular:preview",
"angular:test": "pnpm --stream --filter=angular-slickgrid run test",
"angular:test:coverage": "pnpm --stream --filter=angular-slickgrid run test:coverage",
Expand Down
Loading
Loading