Skip to content

Commit

Permalink
migrate rxjs plugin (#249)
Browse files Browse the repository at this point in the history
Signed-off-by: Jakob Fischl <[email protected]>
  • Loading branch information
jakob0fischl authored Oct 24, 2024
1 parent 46de63a commit 30a783b
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cloudflight/eslint-plugin",
"version": "1.0.0-rc11",
"version": "1.0.0-rc12",
"private": true,
"volta": {
"node": "20.12.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cloudflight/eslint-plugin-angular",
"version": "1.0.0-rc11",
"version": "1.0.0-rc12",
"description": "Cloudflight eslint-plugin & eslint-config for angular",
"volta": {
"extends": "../../package.json"
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cloudflight/eslint-plugin-node",
"version": "1.0.0-rc11",
"version": "1.0.0-rc12",
"description": "Cloudflight eslint-plugin & eslint-config for node",
"volta": {
"extends": "../../package.json"
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cloudflight/eslint-plugin-react",
"version": "1.0.0-rc11",
"version": "1.0.0-rc12",
"description": "Cloudflight eslint-plugin & eslint-config for React",
"volta": {
"extends": "../../package.json"
Expand Down
3 changes: 2 additions & 1 deletion packages/eslint-plugin-typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cloudflight/eslint-plugin-typescript",
"version": "1.0.0-rc11",
"version": "1.0.0-rc12",
"description": "Cloudflight eslint-plugin & eslint-config for typescript",
"volta": {
"extends": "../../package.json"
Expand Down Expand Up @@ -38,6 +38,7 @@
"eslint": ">=9.0.0 < 10.0.0"
},
"devDependencies": {
"@types/eslint-plugin-rxjs": "workspace:*",
"typescript": "5.5.4"
}
}
5 changes: 5 additions & 0 deletions packages/eslint-plugin-typescript/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import {fixupPluginRules} from '@eslint/compat';
import pluginJs from '@eslint/js';
import stylistic from '@stylistic/eslint-plugin';
import eslintPluginImportX from 'eslint-plugin-import-x';
import perfectionist from 'eslint-plugin-perfectionist';
import rxjs from 'eslint-plugin-rxjs';
import tseslint from 'typescript-eslint';

import {customRules} from './configs/custom';
import {eslintRules} from './configs/eslint';
import {formatEslintRules} from './configs/format';
import {importEslintRules} from './configs/import';
import {rxjsRules} from './configs/rxjs';
import {typescriptEslintRules, typescriptEslintRulesDisableTypeChecked} from './configs/typescript-eslint';
import {cloudflightTypescriptPlugin} from './rules';

Expand All @@ -20,6 +23,7 @@ export const cloudflightTypescriptBaseConfig = tseslint.config(
files: ['**/*.{js,mjs,cjs,ts,mts,cts}'],
plugins: {
'@cloudflight/typescript': cloudflightTypescriptPlugin,
rxjs: fixupPluginRules(rxjs),
},
extends: [
pluginJs.configs.recommended,
Expand All @@ -31,6 +35,7 @@ export const cloudflightTypescriptBaseConfig = tseslint.config(
...eslintRules,
...typescriptEslintRules,
...customRules,
...rxjsRules,
},
},
);
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cloudflight/eslint-plugin-vue",
"version": "1.0.0-rc11",
"version": "1.0.0-rc12",
"description": "Cloudflight eslint-plugin & eslint-config for vue",
"volta": {
"extends": "../../package.json"
Expand Down
5 changes: 5 additions & 0 deletions packages/types-eslint-plugin-rxjs/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import {FixupPluginDefinition} from '@eslint/compat';

declare const rxjs: FixupPluginDefinition;

export = rxjs;
18 changes: 18 additions & 0 deletions packages/types-eslint-plugin-rxjs/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "@types/eslint-plugin-rxjs",
"version": "0.1.0",
"description": "TypeScript definitions for eslint-plugin-rxjs",
"homepage": "https://github.com/cloudflightio/cloudflight-eslint-plugin",
"bugs": {
"url": "https://github.com/cloudflightio/cloudflight-eslint-plugin/issues"
},
"private": true,
"author": "Cloudflight GmbH",
"license": "Apache-2.0",
"main": "",
"types": "index.d.ts",
"dependencies": {
"@types/eslint": "*"
},
"typeScriptVersion": "5.5"
}
9 changes: 9 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,7 @@ __metadata:
dependencies:
"@eslint/js": "npm:^9.12.0"
"@stylistic/eslint-plugin": "npm:2.9.0"
"@types/eslint-plugin-rxjs": "workspace:*"
eslint-import-resolver-typescript: "npm:3.6.3"
eslint-plugin-import-x: "npm:4.3.1"
eslint-plugin-perfectionist: "npm:3.9.1"
Expand Down Expand Up @@ -1267,6 +1268,14 @@ __metadata:
languageName: unknown
linkType: soft

"@types/eslint-plugin-rxjs@workspace:*, @types/eslint-plugin-rxjs@workspace:packages/types-eslint-plugin-rxjs":
version: 0.0.0-use.local
resolution: "@types/eslint-plugin-rxjs@workspace:packages/types-eslint-plugin-rxjs"
dependencies:
"@types/eslint": "npm:*"
languageName: unknown
linkType: soft

"@types/eslint-plugin-security@workspace:*, @types/eslint-plugin-security@workspace:packages/types-eslint-plugin-security":
version: 0.0.0-use.local
resolution: "@types/eslint-plugin-security@workspace:packages/types-eslint-plugin-security"
Expand Down

0 comments on commit 30a783b

Please sign in to comment.